Mercurial > emacs
annotate src/lread.c @ 90635:fbcb54456f60
*** empty log message ***
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Thu, 26 Oct 2006 02:32:45 +0000 |
parents | 858cb33ae39d |
children | 02cf29720f31 |
rev | line source |
---|---|
341 | 1 /* Lisp parsing and input streams. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64536
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64536
diff
changeset
|
3 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68649
diff
changeset
|
4 2005, 2006 Free Software Foundation, Inc. |
341 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
8 GNU Emacs is free software; you can redistribute it and/or modify | |
9 it under the terms of the GNU General Public License as published by | |
617 | 10 the Free Software Foundation; either version 2, or (at your option) |
341 | 11 any later version. |
12 | |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
341 | 22 |
23 | |
7898 | 24 #include <config.h> |
341 | 25 #include <stdio.h> |
26 #include <sys/types.h> | |
27 #include <sys/stat.h> | |
28 #include <sys/file.h> | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
29 #include <errno.h> |
341 | 30 #include "lisp.h" |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
31 #include "intervals.h" |
341 | 32 #include "buffer.h" |
88383 | 33 #include "character.h" |
17038 | 34 #include "charset.h" |
88886 | 35 #include "coding.h" |
24412
d11ac02f9d6a
Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents:
23933
diff
changeset
|
36 #include <epaths.h> |
341 | 37 #include "commands.h" |
1591
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
38 #include "keyboard.h" |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
39 #include "termhooks.h" |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
40 #include "coding.h" |
341 | 41 |
42 #ifdef lint | |
43 #include <sys/inode.h> | |
44 #endif /* lint */ | |
45 | |
14972
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
46 #ifdef MSDOS |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
47 #if __DJGPP__ < 2 |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
48 #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
|
49 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
50 #include "msdos.h" |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
51 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
52 |
21799 | 53 #ifdef HAVE_UNISTD_H |
54 #include <unistd.h> | |
55 #endif | |
56 | |
341 | 57 #ifndef X_OK |
58 #define X_OK 01 | |
59 #endif | |
60 | |
61 #include <math.h> | |
62 | |
14950 | 63 #ifdef HAVE_SETLOCALE |
64 #include <locale.h> | |
65 #endif /* HAVE_SETLOCALE */ | |
66 | |
51398 | 67 #ifdef HAVE_FCNTL_H |
68 #include <fcntl.h> | |
69 #endif | |
8596 | 70 #ifndef O_RDONLY |
71 #define O_RDONLY 0 | |
72 #endif | |
73 | |
34428
b2ec0cbfd60a
(file_offset, file_tell): Depend on HAVE_FSEEKO, not
Gerd Moellmann <gerd@gnu.org>
parents:
34362
diff
changeset
|
74 #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
|
75 #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
|
76 #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
|
77 #else |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
78 #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
|
79 #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
|
80 #endif |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
81 |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
82 #ifndef USE_CRT_DLL |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
83 extern int errno; |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
84 #endif |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
85 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
86 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; |
341 | 87 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
|
88 Lisp_Object Qascii_character, Qload, Qload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
89 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
|
90 Lisp_Object Qinhibit_file_name_operation; |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
91 Lisp_Object Qeval_buffer_list, Veval_buffer_list; |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
92 Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
93 |
88886 | 94 /* Used instead of Qget_file_char while loading *.elc files compiled |
95 by Emacs 21 or older. */ | |
96 static Lisp_Object Qget_emacs_mule_file_char; | |
97 | |
98 static Lisp_Object Qload_force_doc_strings; | |
99 | |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
100 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
|
101 extern Lisp_Object Qfile_exists_p; |
341 | 102 |
61623
eac490378ade
(Vloads_in_progress): Static.
Lute Kamstra <lute@gnu.org>
parents:
61418
diff
changeset
|
103 /* non-zero iff inside `load' */ |
341 | 104 int load_in_progress; |
105 | |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
106 /* Directory in which the sources were found. */ |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
107 Lisp_Object Vsource_directory; |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
108 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
109 /* Search path and suffixes for files to be loaded. */ |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
110 Lisp_Object Vload_path, Vload_suffixes, Vload_file_rep_suffixes; |
341 | 111 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
112 /* File name of user's init file. */ |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
113 Lisp_Object Vuser_init_file; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
114 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
115 /* 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
|
116 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
|
117 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
|
118 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
119 /* 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
|
120 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
|
121 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
122 /* List of files that were preloaded. */ |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
123 Lisp_Object Vpreloaded_file_list; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
124 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
125 /* 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
|
126 Lisp_Object Vload_file_name; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
127 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
128 /* 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
|
129 Lisp_Object Vload_read_function; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
130 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
131 /* 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
|
132 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
|
133 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
|
134 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
|
135 Lisp_Object read_objects; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
136 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
137 /* 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
|
138 static int load_force_doc_strings; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
139 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
140 /* 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
|
141 static int load_convert_to_unibyte; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
142 |
88886 | 143 /* Nonzero means READCHAR should read bytes one by one (not character) |
144 when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char. | |
145 This is set to 1 by read1 temporarily while handling #@NUMBER. */ | |
146 static int load_each_byte; | |
147 | |
17038 | 148 /* Function to use for loading an Emacs lisp source file (not |
149 compiled) instead of readevalloop. */ | |
150 Lisp_Object Vload_source_file_function; | |
151 | |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
152 /* 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
|
153 Lisp_Object Vbyte_boolean_vars; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
154 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
155 /* 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
|
156 read. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
157 Lisp_Object Vread_with_symbol_positions; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
158 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
159 /* List of (SYMBOL . POSITION) accumulated so far. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
160 Lisp_Object Vread_symbol_positions_list; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
161 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
162 /* 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
|
163 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
|
164 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
165 /* File for get_file_char to read from. Use by load. */ |
341 | 166 static FILE *instream; |
167 | |
168 /* When nonzero, read conses in pure space */ | |
169 static int read_pure; | |
170 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
171 /* For use within read-from-string (this reader is non-reentrant!!) */ |
341 | 172 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
|
173 static int read_from_string_index_byte; |
341 | 174 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
|
175 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
176 /* 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
|
177 Fread_from_string. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
178 static int readchar_count; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
179 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
180 /* This contains the last string skipped with #@. */ |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
181 static char *saved_doc_string; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
182 /* Length of buffer allocated in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
183 static int saved_doc_string_size; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
184 /* Length of actual data in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
185 static int saved_doc_string_length; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
186 /* This is the file position that string came from. */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
187 static file_offset saved_doc_string_position; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
188 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
189 /* 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
|
190 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
|
191 is put in saved_doc_string. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
192 static char *prev_saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
193 /* 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
|
194 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
|
195 /* 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
|
196 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
|
197 /* 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
|
198 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
|
199 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
200 /* 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
|
201 with no surrounding parentheses. |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
202 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
|
203 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
|
204 static int new_backquote_flag; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
205 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
206 /* 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
|
207 check for recursive loads. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
208 |
61623
eac490378ade
(Vloads_in_progress): Static.
Lute Kamstra <lute@gnu.org>
parents:
61418
diff
changeset
|
209 static Lisp_Object Vloads_in_progress; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
210 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
211 /* Non-zero means load dangerous compiled Lisp files. */ |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
212 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
213 int load_dangerous_libraries; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
214 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
215 /* 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
|
216 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
217 static Lisp_Object Vbytecomp_version_regexp; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
218 |
88886 | 219 static int read_emacs_mule_char P_ ((int, int (*) (int, Lisp_Object), |
220 Lisp_Object)); | |
221 | |
47847
dd601595b35d
Minor white space fix, just supplement the log for previous change:
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47839
diff
changeset
|
222 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
|
223 Lisp_Object (*) (), int, |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
224 Lisp_Object, Lisp_Object, |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
225 Lisp_Object, Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
226 static Lisp_Object load_unwind P_ ((Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
227 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
|
228 |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
229 static void invalid_syntax P_ ((const char *, int)) NO_RETURN; |
72005
da0099bc0ba4
* ebrowse.c (usage, version): Mark as NO_RETURN.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
71984
diff
changeset
|
230 static void end_of_file_error P_ (()) NO_RETURN; |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
231 |
341 | 232 |
88886 | 233 /* Functions that read one byte from the current source READCHARFUN |
234 or unreads one byte. If the integer argument C is -1, it returns | |
235 one read byte, or -1 when there's no more byte in the source. If C | |
236 is 0 or positive, it unreads C, and the return value is not | |
237 interesting. */ | |
238 | |
239 static int readbyte_for_lambda P_ ((int, Lisp_Object)); | |
240 static int readbyte_from_file P_ ((int, Lisp_Object)); | |
241 static int readbyte_from_string P_ ((int, Lisp_Object)); | |
242 | |
341 | 243 /* Handle unreading and rereading of characters. |
244 Write READCHAR to read a character, | |
17038 | 245 UNREAD(c) to unread c to be read again. |
246 | |
88886 | 247 These macros correctly read/unread multibyte characters. */ |
341 | 248 |
249 #define READCHAR readchar (readcharfun) | |
250 #define UNREAD(c) unreadchar (readcharfun, c) | |
251 | |
88886 | 252 /* When READCHARFUN is Qget_file_char, Qget_emacs_mule_file_char, |
89483 | 253 Qlambda, or a cons, we use this to keep an unread character because |
254 a file stream can't handle multibyte-char unreading. The value -1 | |
88886 | 255 means that there's no unread character. */ |
256 static int unread_char; | |
257 | |
341 | 258 static int |
259 readchar (readcharfun) | |
260 Lisp_Object readcharfun; | |
261 { | |
262 Lisp_Object tem; | |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
263 register int c; |
88886 | 264 int (*readbyte) P_ ((int, Lisp_Object)); |
265 unsigned char buf[MAX_MULTIBYTE_LENGTH]; | |
266 int i, len; | |
267 int emacs_mule_encoding = 0; | |
341 | 268 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
269 readchar_count++; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
270 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
271 if (BUFFERP (readcharfun)) |
341 | 272 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
273 register struct buffer *inbuffer = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
274 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
275 int pt_byte = BUF_PT_BYTE (inbuffer); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
276 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
277 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
|
278 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
279 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
280 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
281 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
282 /* 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
|
283 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
|
284 BUF_INC_POS (inbuffer, pt_byte); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
285 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
|
286 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
287 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
288 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
289 c = BUF_FETCH_BYTE (inbuffer, pt_byte); |
88886 | 290 if (! ASCII_BYTE_P (c)) |
291 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
292 pt_byte++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
293 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
294 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
|
295 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
296 return c; |
341 | 297 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
298 if (MARKERP (readcharfun)) |
341 | 299 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
300 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
|
301 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
302 int bytepos = marker_byte_position (readcharfun); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
303 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
304 if (bytepos >= BUF_ZV_BYTE (inbuffer)) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
305 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
306 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
307 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
308 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
309 /* 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
|
310 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
|
311 BUF_INC_POS (inbuffer, bytepos); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
312 c = STRING_CHAR (p, bytepos - orig_bytepos); |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
313 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
314 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
315 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
316 c = BUF_FETCH_BYTE (inbuffer, bytepos); |
88886 | 317 if (! ASCII_BYTE_P (c)) |
318 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
319 bytepos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
320 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
321 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
322 XMARKER (readcharfun)->bytepos = bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
323 XMARKER (readcharfun)->charpos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
324 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
325 return c; |
341 | 326 } |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
327 |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
328 if (EQ (readcharfun, Qlambda)) |
88886 | 329 { |
330 readbyte = readbyte_for_lambda; | |
331 goto read_multibyte; | |
332 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
333 |
341 | 334 if (EQ (readcharfun, Qget_file_char)) |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
335 { |
88886 | 336 readbyte = readbyte_from_file; |
337 goto read_multibyte; | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
338 } |
341 | 339 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
340 if (STRINGP (readcharfun)) |
341 | 341 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
342 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
|
343 c = -1; |
29014
4c02859dda27
(read1): On reading multibyte string, be sure to make
Kenichi Handa <handa@m17n.org>
parents:
28746
diff
changeset
|
344 else |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
345 FETCH_STRING_CHAR_ADVANCE (c, readcharfun, |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
346 read_from_string_index, |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
347 read_from_string_index_byte); |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
348 |
341 | 349 return c; |
350 } | |
351 | |
88886 | 352 if (CONSP (readcharfun)) |
353 { | |
354 /* This is the case that read_vector is reading from a unibyte | |
355 string that contains a byte sequence previously skipped | |
356 because of #@NUMBER. The car part of readcharfun is that | |
357 string, and the cdr part is a value of readcharfun given to | |
358 read_vector. */ | |
359 readbyte = readbyte_from_string; | |
360 if (EQ (XCDR (readcharfun), Qget_emacs_mule_file_char)) | |
361 emacs_mule_encoding = 1; | |
362 goto read_multibyte; | |
363 } | |
89483 | 364 |
88886 | 365 if (EQ (readcharfun, Qget_emacs_mule_file_char)) |
366 { | |
367 readbyte = readbyte_from_file; | |
368 emacs_mule_encoding = 1; | |
369 goto read_multibyte; | |
370 } | |
341 | 371 |
372 tem = call0 (readcharfun); | |
373 | |
485 | 374 if (NILP (tem)) |
341 | 375 return -1; |
376 return XINT (tem); | |
88886 | 377 |
378 read_multibyte: | |
379 if (unread_char >= 0) | |
380 { | |
381 c = unread_char; | |
382 unread_char = -1; | |
383 return c; | |
384 } | |
385 c = (*readbyte) (-1, readcharfun); | |
386 if (c < 0 || ASCII_BYTE_P (c) || load_each_byte) | |
387 return c; | |
388 if (emacs_mule_encoding) | |
389 return read_emacs_mule_char (c, readbyte, readcharfun); | |
390 i = 0; | |
391 buf[i++] = c; | |
392 len = BYTES_BY_CHAR_HEAD (c); | |
393 while (i < len) | |
394 { | |
395 c = (*readbyte) (-1, readcharfun); | |
396 if (c < 0 || ! TRAILING_CODE_P (c)) | |
397 { | |
398 while (--i > 1) | |
399 (*readbyte) (buf[i], readcharfun); | |
400 return BYTE8_TO_CHAR (buf[0]); | |
401 } | |
402 buf[i++] = c; | |
403 } | |
404 return STRING_CHAR (buf, i); | |
341 | 405 } |
406 | |
407 /* Unread the character C in the way appropriate for the stream READCHARFUN. | |
408 If the stream is a user function, call it with the char as argument. */ | |
409 | |
410 static void | |
411 unreadchar (readcharfun, c) | |
412 Lisp_Object readcharfun; | |
413 int c; | |
414 { | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
415 readchar_count--; |
6471
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
416 if (c == -1) |
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
417 /* 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
|
418 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
|
419 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
420 else if (BUFFERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
421 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
422 struct buffer *b = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
423 int bytepos = BUF_PT_BYTE (b); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
424 |
88886 | 425 BUF_PT (b)--; |
426 if (! NILP (b->enable_multibyte_characters)) | |
427 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
428 else |
88886 | 429 bytepos--; |
430 | |
431 BUF_PT_BYTE (b) = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
432 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
433 else if (MARKERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
434 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
435 struct buffer *b = XMARKER (readcharfun)->buffer; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
436 int bytepos = XMARKER (readcharfun)->bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
437 |
88886 | 438 XMARKER (readcharfun)->charpos--; |
439 if (! NILP (b->enable_multibyte_characters)) | |
440 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
441 else |
88886 | 442 bytepos--; |
443 | |
444 XMARKER (readcharfun)->bytepos = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
445 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
446 else if (STRINGP (readcharfun)) |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
447 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
448 read_from_string_index--; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
449 read_from_string_index_byte |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
450 = 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
|
451 } |
88886 | 452 else if (CONSP (readcharfun)) |
453 { | |
454 unread_char = c; | |
455 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
456 else if (EQ (readcharfun, Qlambda)) |
88886 | 457 { |
458 unread_char = c; | |
459 } | |
460 else if (EQ (readcharfun, Qget_file_char) | |
461 || EQ (readcharfun, Qget_emacs_mule_file_char)) | |
462 { | |
463 if (load_each_byte) | |
464 ungetc (c, instream); | |
465 else | |
466 unread_char = c; | |
467 } | |
341 | 468 else |
469 call1 (readcharfun, make_number (c)); | |
470 } | |
471 | |
88886 | 472 static int |
473 readbyte_for_lambda (c, readcharfun) | |
474 int c; | |
475 Lisp_Object readcharfun; | |
476 { | |
477 return read_bytecode_char (c >= 0); | |
478 } | |
479 | |
480 | |
481 static int | |
482 readbyte_from_file (c, readcharfun) | |
483 int c; | |
484 Lisp_Object readcharfun; | |
485 { | |
486 if (c >= 0) | |
487 { | |
488 ungetc (c, instream); | |
489 return 0; | |
490 } | |
491 | |
492 c = getc (instream); | |
493 #ifdef EINTR | |
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
494 /* Interrupted reads have been observed while reading over the network */ |
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
495 while (c == EOF && ferror (instream) && errno == EINTR) |
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
496 { |
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
497 QUIT; |
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
498 clearerr (instream); |
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
499 c = getc (instream); |
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
500 } |
88886 | 501 #endif |
502 return (c == EOF ? -1 : c); | |
503 } | |
504 | |
505 static int | |
506 readbyte_from_string (c, readcharfun) | |
507 int c; | |
508 Lisp_Object readcharfun; | |
509 { | |
510 Lisp_Object string = XCAR (readcharfun); | |
511 | |
512 if (c >= 0) | |
513 { | |
514 read_from_string_index--; | |
515 read_from_string_index_byte | |
516 = string_char_to_byte (string, read_from_string_index); | |
517 } | |
89483 | 518 |
88886 | 519 if (read_from_string_index >= read_from_string_limit) |
520 c = -1; | |
521 else | |
522 FETCH_STRING_CHAR_ADVANCE (c, string, | |
523 read_from_string_index, | |
524 read_from_string_index_byte); | |
525 return c; | |
526 } | |
527 | |
528 | |
529 /* Read one non-ASCII character from INSTREAM. The character is | |
530 encoded in `emacs-mule' and the first byte is already read in | |
531 C. */ | |
532 | |
533 extern char emacs_mule_bytes[256]; | |
534 | |
535 static int | |
536 read_emacs_mule_char (c, readbyte, readcharfun) | |
537 int c; | |
538 int (*readbyte) P_ ((int, Lisp_Object)); | |
539 Lisp_Object readcharfun; | |
540 { | |
541 /* Emacs-mule coding uses at most 4-byte for one character. */ | |
542 unsigned char buf[4]; | |
543 int len = emacs_mule_bytes[c]; | |
544 struct charset *charset; | |
545 int i; | |
546 unsigned code; | |
547 | |
548 if (len == 1) | |
549 /* C is not a valid leading-code of `emacs-mule'. */ | |
550 return BYTE8_TO_CHAR (c); | |
551 | |
552 i = 0; | |
553 buf[i++] = c; | |
554 while (i < len) | |
555 { | |
556 c = (*readbyte) (-1, readcharfun); | |
557 if (c < 0xA0) | |
558 { | |
559 while (--i > 1) | |
560 (*readbyte) (buf[i], readcharfun); | |
561 return BYTE8_TO_CHAR (buf[0]); | |
562 } | |
563 buf[i++] = c; | |
564 } | |
565 | |
566 if (len == 2) | |
567 { | |
89417 | 568 charset = emacs_mule_charset[buf[0]]; |
88886 | 569 code = buf[1] & 0x7F; |
570 } | |
571 else if (len == 3) | |
572 { | |
573 if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 | |
574 || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) | |
575 { | |
576 charset = emacs_mule_charset[buf[1]]; | |
577 code = buf[2] & 0x7F; | |
578 } | |
579 else | |
580 { | |
581 charset = emacs_mule_charset[buf[0]]; | |
582 code = ((buf[1] << 8) | buf[2]) & 0x7F7F; | |
583 } | |
584 } | |
585 else | |
586 { | |
587 charset = emacs_mule_charset[buf[1]]; | |
89483 | 588 code = ((buf[2] << 8) | buf[3]) & 0x7F7F; |
88886 | 589 } |
590 c = DECODE_CHAR (charset, code); | |
591 if (c < 0) | |
592 Fsignal (Qinvalid_read_syntax, | |
593 Fcons (build_string ("invalid multibyte form"), Qnil)); | |
594 return c; | |
595 } | |
596 | |
597 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
598 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
|
599 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
600 static Lisp_Object read0 P_ ((Lisp_Object)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
601 static Lisp_Object read1 P_ ((Lisp_Object, int *, int)); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
602 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
603 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
|
604 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
|
605 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
606 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
|
607 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
608 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
|
609 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
610 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
|
611 |
341 | 612 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
613 /* Get a character from the tty. */ |
341 | 614 |
1519
5d0837ebee9c
* lread.c (read_char): Add an extern declaration for this,
Jim Blandy <jimb@redhat.com>
parents:
1092
diff
changeset
|
615 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
|
616 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
617 /* 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
|
618 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
619 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
|
620 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
|
621 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
|
622 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
623 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
|
624 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
|
625 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
|
626 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
627 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
|
628 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
|
629 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
|
630 character. |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
631 |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
632 If INPUT_METHOD is nonzero, we invoke the current input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
633 if the character warrants that. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
634 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
635 If SECONDS is a number, we wait that many seconds for input, and |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
636 return Qnil if no input arrives within that time. */ |
14483
7f49c41db1e8
(Fread_char_exclusive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14300
diff
changeset
|
637 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
638 Lisp_Object |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
639 read_filtered_event (no_switch_frame, ascii_required, error_nonascii, |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
640 input_method, seconds) |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
641 int no_switch_frame, ascii_required, error_nonascii, input_method; |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
642 Lisp_Object seconds; |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
643 { |
71672
9c4db0e8490f
(read_filtered_event): Remove `register' qualifier because it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71558
diff
changeset
|
644 Lisp_Object val, delayed_switch_frame; |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
645 EMACS_TIME end_time; |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
646 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
647 #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
|
648 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
649 cancel_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
650 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
651 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
652 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
|
653 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
654 /* Compute timeout. */ |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
655 if (NUMBERP (seconds)) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
656 { |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
657 EMACS_TIME wait_time; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
658 int sec, usec; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
659 double duration = extract_float (seconds); |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
660 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
661 sec = (int) duration; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
662 usec = (duration - sec) * 1000000; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
663 EMACS_GET_TIME (end_time); |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
664 EMACS_SET_SECS_USECS (wait_time, sec, usec); |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
665 EMACS_ADD_TIME (end_time, end_time, wait_time); |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
666 } |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
667 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
668 /* 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
|
669 retry: |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
670 val = read_char (0, 0, 0, (input_method ? Qnil : Qt), 0, |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
671 NUMBERP (seconds) ? &end_time : NULL); |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
672 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
673 if (BUFFERP (val)) |
5888
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
674 goto retry; |
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
675 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
676 /* switch-frame events are put off until after the next ASCII |
14036 | 677 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
|
678 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
|
679 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
|
680 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
|
681 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
|
682 && EVENT_HAS_PARAMETERS (val) |
71558
4252d6e24270
(read_filtered_event): Treat select-window just like switch-frame.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71484
diff
changeset
|
683 && EQ (EVENT_HEAD_KIND (EVENT_HEAD (val)), Qswitch_frame)) |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
684 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
685 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
|
686 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
687 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
688 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
689 if (ascii_required && !(NUMBERP (seconds) && NILP (val))) |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
690 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
691 /* 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
|
692 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
|
693 { |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
694 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
|
695 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
|
696 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
|
697 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
698 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
|
699 /* 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
|
700 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
|
701 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
|
702 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
|
703 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
704 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
705 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
706 /* 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
|
707 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
|
708 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
709 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
|
710 { |
7106
06542cc6ddcd
(read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
711 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
|
712 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
|
713 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
714 else |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
715 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
716 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
717 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
718 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
719 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
|
720 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
|
721 |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
722 #if 0 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
723 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
724 #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
|
725 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
726 start_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
727 #endif |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
728 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
729 #endif |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
730 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
731 return val; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
732 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
733 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
734 DEFUN ("read-char", Fread_char, Sread_char, 0, 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
|
735 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
|
736 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
|
737 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
|
738 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
|
739 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
|
740 be read. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
741 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
|
742 `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
|
743 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
744 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
|
745 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
|
746 input method is turned on in the current buffer, that input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
747 is used for reading a character. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
748 If the optional argument SECONDS is non-nil, it should be a number |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
749 specifying the maximum number of seconds to wait for input. If no |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
750 input arrives in that time, return nil. SECONDS may be a |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
751 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
752 (prompt, inherit_input_method, seconds) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
753 Lisp_Object prompt, inherit_input_method, seconds; |
341 | 754 { |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
755 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
756 message_with_string ("%s", prompt, 0); |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
757 return read_filtered_event (1, 1, 1, ! NILP (inherit_input_method), seconds); |
341 | 758 } |
759 | |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
760 DEFUN ("read-event", Fread_event, Sread_event, 0, 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
|
761 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
|
762 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
|
763 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
|
764 input method is turned on in the current buffer, that input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
765 is used for reading a character. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
766 If the optional argument SECONDS is non-nil, it should be a number |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
767 specifying the maximum number of seconds to wait for input. If no |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
768 input arrives in that time, return nil. SECONDS may be a |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
769 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
770 (prompt, inherit_input_method, seconds) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
771 Lisp_Object prompt, inherit_input_method, seconds; |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
772 { |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
773 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
774 message_with_string ("%s", prompt, 0); |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
775 return read_filtered_event (0, 0, 0, ! NILP (inherit_input_method), seconds); |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
776 } |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
777 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
778 DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 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
|
779 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
|
780 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
|
781 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
782 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
|
783 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
|
784 input method is turned on in the current buffer, that input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
785 is used for reading a character. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
786 If the optional argument SECONDS is non-nil, it should be a number |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
787 specifying the maximum number of seconds to wait for input. If no |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
788 input arrives in that time, return nil. SECONDS may be a |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
789 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
790 (prompt, inherit_input_method, seconds) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
791 Lisp_Object prompt, inherit_input_method, seconds; |
341 | 792 { |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
793 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
794 message_with_string ("%s", prompt, 0); |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
795 return read_filtered_event (1, 1, 0, ! NILP (inherit_input_method), seconds); |
341 | 796 } |
797 | |
798 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
|
799 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
|
800 () |
341 | 801 { |
802 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
|
803 XSETINT (val, getc (instream)); |
341 | 804 return val; |
805 } | |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
806 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
807 |
341 | 808 |
88886 | 809 /* Value is a version number of byte compiled code if the file |
89483 | 810 asswociated with file descriptor FD is a compiled Lisp file that's |
88886 | 811 safe to load. Only files compiled with Emacs are safe to load. |
812 Files compiled with XEmacs can lead to a crash in Fbyte_code | |
813 because of an incompatible change in the byte compiler. */ | |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
814 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
815 static int |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
816 safe_to_load_p (fd) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
817 int fd; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
818 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
819 char buf[512]; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
820 int nbytes, i; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
821 int safe_p = 1; |
89483 | 822 int version = 1; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
823 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
824 /* 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
|
825 specifying the byte compiler version used. */ |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
826 nbytes = emacs_read (fd, buf, sizeof buf - 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
827 if (nbytes > 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
828 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
829 buf[nbytes] = '\0'; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
830 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
831 /* Skip to the next newline, skipping over the initial `ELC' |
88774 | 832 with NUL bytes following it, but note the version. */ |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
833 for (i = 0; i < nbytes && buf[i] != '\n'; ++i) |
88774 | 834 if (i == 4) |
88886 | 835 version = buf[i]; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
836 |
89012
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
837 if (i == nbytes |
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
838 || fast_c_string_match_ignore_case (Vbytecomp_version_regexp, |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
839 buf + i) < 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
840 safe_p = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
841 } |
88774 | 842 if (safe_p) |
843 safe_p = version; | |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
844 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
845 lseek (fd, 0, SEEK_SET); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
846 return safe_p; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
847 } |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
848 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
849 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
850 /* 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
|
851 after loading a file successfully. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
852 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
853 static Lisp_Object |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
854 record_load_unwind (old) |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
855 Lisp_Object old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
856 { |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
857 return Vloads_in_progress = old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
858 } |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
859 |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
860 /* This handler function is used via internal_condition_case_1. */ |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
861 |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
862 static Lisp_Object |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
863 load_error_handler (data) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
864 Lisp_Object data; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
865 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
866 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
867 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
868 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
869 DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
870 doc: /* Return the suffixes that `load' should try if a suffix is \ |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
871 required. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
872 This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
873 () |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
874 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
875 Lisp_Object lst = Qnil, suffixes = Vload_suffixes, suffix, ext; |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
876 while (CONSP (suffixes)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
877 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
878 Lisp_Object exts = Vload_file_rep_suffixes; |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
879 suffix = XCAR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
880 suffixes = XCDR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
881 while (CONSP (exts)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
882 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
883 ext = XCAR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
884 exts = XCDR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
885 lst = Fcons (concat2 (suffix, ext), lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
886 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
887 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
888 return Fnreverse (lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
889 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
890 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
891 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
|
892 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
|
893 First try FILE with `.elc' appended, then try with `.el', |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
894 then try FILE unmodified (the exact suffixes in the exact order are |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
895 determined by `load-suffixes'). Environment variable references in |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
896 FILE are replaced with their values by calling `substitute-in-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
|
897 This function searches the directories in `load-path'. |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
898 |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
899 If optional second arg NOERROR is non-nil, |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
900 report no error if FILE doesn't exist. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
901 Print messages at start and end of loading unless |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
902 optional third arg NOMESSAGE is non-nil. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
903 If optional fourth arg NOSUFFIX is non-nil, don't try adding |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
904 suffixes `.elc' or `.el' to the specified name FILE. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
905 If optional fifth arg MUST-SUFFIX is non-nil, insist on |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
906 the suffix `.elc' or `.el'; don't accept just FILE unless |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
907 it ends in one of those suffixes or includes a directory name. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
908 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
909 If this function fails to find a file, it may look for different |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
910 representations of that file before trying another file. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
911 It does so by adding the non-empty suffixes in `load-file-rep-suffixes' |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
912 to the file name. Emacs uses this feature mainly to find compressed |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
913 versions of files when Auto Compression mode is enabled. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
914 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
915 The exact suffixes that this function tries out, in the exact order, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
916 are given by the value of the variable `load-file-rep-suffixes' if |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
917 NOSUFFIX is non-nil and by the return value of the function |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
918 `get-load-suffixes' if MUST-SUFFIX is non-nil. If both NOSUFFIX and |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
919 MUST-SUFFIX are nil, this function first tries out the latter suffixes |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
920 and then the former. |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
921 |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
922 Loading a file records its definitions, and its `provide' and |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
923 `require' calls, in an element of `load-history' whose |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
924 car is the file name loaded. See `load-history'. |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
925 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
926 Return t if the file exists and loads successfully. */) |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
927 (file, noerror, nomessage, nosuffix, must_suffix) |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
928 Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; |
341 | 929 { |
930 register FILE *stream; | |
931 register int fd = -1; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
932 int count = SPECPDL_INDEX (); |
341 | 933 Lisp_Object temp; |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
934 struct gcpro gcpro1, gcpro2, gcpro3; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
935 Lisp_Object found, efound, hist_file_name; |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
936 /* 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
|
937 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
|
938 /* 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
|
939 int compiled = 0; |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
940 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
|
941 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
|
942 char *fmode = "r"; |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
943 Lisp_Object tmp[2]; |
88886 | 944 int version; |
945 | |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
946 #ifdef DOS_NT |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
947 fmode = "rt"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
948 #endif /* DOS_NT */ |
341 | 949 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
950 CHECK_STRING (file); |
341 | 951 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
952 /* 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
|
953 /* 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
|
954 handler = Ffind_file_name_handler (file, Qload); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
955 if (!NILP (handler)) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
956 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
|
957 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
958 /* 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
|
959 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
|
960 (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
|
961 The presence of this call is the result of a historical accident: |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
962 it used to be in every file-operation and when it got removed |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
963 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
|
964 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
|
965 that it seemed risky to remove. */ |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
966 if (! NILP (noerror)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
967 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
968 file = internal_condition_case_1 (Fsubstitute_in_file_name, file, |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
969 Qt, load_error_handler); |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
970 if (NILP (file)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
971 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
972 } |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
973 else |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
974 file = Fsubstitute_in_file_name (file); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
975 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
976 |
341 | 977 /* Avoid weird lossage with null string as arg, |
978 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
|
979 if (SCHARS (file) > 0) |
341 | 980 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
981 int size = SBYTES (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
|
982 |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
983 found = Qnil; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
984 GCPRO2 (file, found); |
19622
be0876941b71
(Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents:
19240
diff
changeset
|
985 |
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
|
986 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
|
987 { |
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
|
988 /* 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
|
989 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
|
990 && !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
|
991 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
|
992 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
|
993 && !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
|
994 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
|
995 /* 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
|
996 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
|
997 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
|
998 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
|
999 } |
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
|
1000 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
1001 fd = openp (Vload_path, file, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1002 (!NILP (nosuffix) ? Qnil |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1003 : !NILP (must_suffix) ? Fget_load_suffixes () |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1004 : Fappend (2, (tmp[0] = Fget_load_suffixes (), |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1005 tmp[1] = Vload_file_rep_suffixes, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1006 tmp))), |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1007 &found, Qnil); |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1008 UNGCPRO; |
341 | 1009 } |
1010 | |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1011 if (fd == -1) |
341 | 1012 { |
485 | 1013 if (NILP (noerror)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1014 xsignal2 (Qfile_error, build_string ("Cannot open load file"), file); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1015 return Qnil; |
341 | 1016 } |
1017 | |
29122
47f68a566622
(Fload): Add a comment about the meaning of
Gerd Moellmann <gerd@gnu.org>
parents:
29014
diff
changeset
|
1018 /* 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
|
1019 if (EQ (Qt, Vuser_init_file)) |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1020 Vuser_init_file = found; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1021 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1022 /* 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
|
1023 if (fd == -2) |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1024 { |
23193
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1025 if (NILP (Fequal (found, file))) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1026 /* 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
|
1027 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
|
1028 the `load' operation on FILE. */ |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1029 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
|
1030 else |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1031 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
|
1032 if (! NILP (handler)) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1033 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
|
1034 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1035 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1036 /* 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
|
1037 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1038 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
|
1039 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
|
1040 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
|
1041 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
|
1042 leads to a certain amount of ``normal'' recursion. |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1043 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1044 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
|
1045 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
|
1046 { |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1047 int count = 0; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1048 Lisp_Object tem; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1049 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
|
1050 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
|
1051 count++; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1052 if (count > 3) |
68301
581e383fb47c
(Fload): Don't leak the file descriptor returned by openp if we are going
Eli Zaretskii <eliz@gnu.org>
parents:
67906
diff
changeset
|
1053 { |
581e383fb47c
(Fload): Don't leak the file descriptor returned by openp if we are going
Eli Zaretskii <eliz@gnu.org>
parents:
67906
diff
changeset
|
1054 if (fd >= 0) |
581e383fb47c
(Fload): Don't leak the file descriptor returned by openp if we are going
Eli Zaretskii <eliz@gnu.org>
parents:
67906
diff
changeset
|
1055 emacs_close (fd); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1056 signal_error ("Recursive load", Fcons (found, Vloads_in_progress)); |
68301
581e383fb47c
(Fload): Don't leak the file descriptor returned by openp if we are going
Eli Zaretskii <eliz@gnu.org>
parents:
67906
diff
changeset
|
1057 } |
41463
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1058 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
|
1059 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
|
1060 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1061 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1062 /* Get the name for load-history. */ |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1063 hist_file_name = (! NILP (Vpurify_flag) |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1064 ? Fconcat (2, (tmp[0] = Ffile_name_directory (file), |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1065 tmp[1] = Ffile_name_nondirectory (found), |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1066 tmp)) |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1067 : found) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1068 |
88886 | 1069 version = -1; |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1070 if (!bcmp (SDATA (found) + SBYTES (found) - 4, |
88886 | 1071 ".elc", 4) |
1072 || (version = safe_to_load_p (fd)) > 0) | |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1073 /* 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
|
1074 remote and have no handler! */ |
341 | 1075 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1076 if (fd != -2) |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1077 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1078 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
|
1079 int result; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1080 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1081 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1082 |
88886 | 1083 if (version < 0 |
1084 && ! (version = safe_to_load_p (fd))) | |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1085 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1086 safe_p = 0; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1087 if (!load_dangerous_libraries) |
48087
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1088 { |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1089 if (fd >= 0) |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1090 emacs_close (fd); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1091 error ("File `%s' was not compiled in Emacs", |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1092 SDATA (found)); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1093 } |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1094 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
|
1095 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
|
1096 } |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1097 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1098 compiled = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1099 |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1100 efound = ENCODE_FILE (found); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1101 |
33570 | 1102 #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
|
1103 fmode = "rb"; |
33570 | 1104 #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
|
1105 stat ((char *)SDATA (efound), &s1); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1106 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
|
1107 result = stat ((char *)SDATA (efound), &s2); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1108 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
|
1109 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1110 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
|
1111 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1112 /* 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
|
1113 newer = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1114 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1115 /* 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
|
1116 if (!NILP (nomessage)) |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1117 { |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1118 Lisp_Object msg_file; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1119 msg_file = Fsubstring (found, make_number (0), make_number (-1)); |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1120 message_with_string ("Source file `%s' newer than byte-compiled file", |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1121 msg_file, 1); |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1122 } |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1123 } |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1124 UNGCPRO; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1125 } |
341 | 1126 } |
17038 | 1127 else |
1128 { | |
1129 /* We are loading a source file (*.el). */ | |
1130 if (!NILP (Vload_source_file_function)) | |
1131 { | |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1132 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
|
1133 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1134 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
|
1135 emacs_close (fd); |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1136 val = call4 (Vload_source_file_function, found, hist_file_name, |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1137 NILP (noerror) ? Qnil : Qt, |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1138 NILP (nomessage) ? Qnil : Qt); |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1139 return unbind_to (count, val); |
17038 | 1140 } |
1141 } | |
341 | 1142 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1143 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1144 |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1145 #ifdef WINDOWSNT |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1146 emacs_close (fd); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1147 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
|
1148 stream = fopen ((char *) SDATA (efound), fmode); |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1149 #else /* not WINDOWSNT */ |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1150 stream = fdopen (fd, fmode); |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1151 #endif /* not WINDOWSNT */ |
341 | 1152 if (stream == 0) |
1153 { | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1154 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
|
1155 error ("Failure to create stdio stream for %s", SDATA (file)); |
341 | 1156 } |
1157 | |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1158 if (! NILP (Vpurify_flag)) |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1159 Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list); |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1160 |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
1161 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
|
1162 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1163 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1164 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
|
1165 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1166 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1167 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
|
1168 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1169 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
|
1170 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1171 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
|
1172 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
|
1173 } |
341 | 1174 |
64533
dc17db575e11
(Fload, load_unwind): Use make_save_value to unwind
Kim F. Storm <storm@cua.dk>
parents:
64317
diff
changeset
|
1175 record_unwind_protect (load_unwind, make_save_value (stream, 0)); |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1176 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
|
1177 specbind (Qload_file_name, found); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1178 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
|
1179 load_descriptor_list |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1180 = Fcons (make_number (fileno (stream)), load_descriptor_list); |
341 | 1181 load_in_progress++; |
88888
1b6e73e289bc
(Fload): Don't load with Qload_force_doc_strings t if
Kenichi Handa <handa@m17n.org>
parents:
88886
diff
changeset
|
1182 if (! version || version >= 22) |
90428 | 1183 readevalloop (Qget_file_char, stream, hist_file_name, |
90260
0ca0d9181b5e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95
Miles Bader <miles@gnu.org>
diff
changeset
|
1184 Feval, 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1185 else |
1186 { | |
1187 /* We can't handle a file which was compiled with | |
1188 byte-compile-dynamic by older version of Emacs. */ | |
1189 specbind (Qload_force_doc_strings, Qt); | |
90428 | 1190 readevalloop (Qget_emacs_mule_file_char, stream, hist_file_name, Feval, |
90140
02f1dbc4a199
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Miles Bader <miles@gnu.org>
diff
changeset
|
1191 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1192 } |
341 | 1193 unbind_to (count, Qnil); |
1194 | |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1195 /* Run any eval-after-load forms for this file */ |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1196 if (NILP (Vpurify_flag) |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1197 && (!NILP (Ffboundp (Qdo_after_load_evaluation)))) |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1198 call1 (Qdo_after_load_evaluation, hist_file_name) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1199 |
341 | 1200 UNGCPRO; |
1201 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1202 if (saved_doc_string) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1203 free (saved_doc_string); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1204 saved_doc_string = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1205 saved_doc_string_size = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1206 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1207 if (prev_saved_doc_string) |
27852
98f55bbdbbad
(Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents:
27763
diff
changeset
|
1208 xfree (prev_saved_doc_string); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1209 prev_saved_doc_string = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1210 prev_saved_doc_string_size = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1211 |
485 | 1212 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
|
1213 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1214 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1215 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
|
1216 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1217 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1218 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
|
1219 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1220 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
|
1221 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1222 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
|
1223 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
|
1224 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1225 |
51066
0c125011ae21
(Fload): Print a message if package is obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50513
diff
changeset
|
1226 if (!NILP (Fequal (build_string ("obsolete"), |
0c125011ae21
(Fload): Print a message if package is obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50513
diff
changeset
|
1227 Ffile_name_nondirectory |
0c125011ae21
(Fload): Print a message if package is obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50513
diff
changeset
|
1228 (Fdirectory_file_name (Ffile_name_directory (found)))))) |
0c125011ae21
(Fload): Print a message if package is obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50513
diff
changeset
|
1229 message_with_string ("Package %s is obsolete", file, 1); |
0c125011ae21
(Fload): Print a message if package is obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50513
diff
changeset
|
1230 |
341 | 1231 return Qt; |
1232 } | |
1233 | |
1234 static Lisp_Object | |
64536
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1235 load_unwind (arg) /* used as unwind-protect function in load */ |
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1236 Lisp_Object arg; |
341 | 1237 { |
64536
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1238 FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; |
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1239 if (stream != NULL) |
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1240 fclose (stream); |
341 | 1241 if (--load_in_progress < 0) load_in_progress = 0; |
1242 return Qnil; | |
1243 } | |
1244 | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1245 static Lisp_Object |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1246 load_descriptor_unwind (oldlist) |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1247 Lisp_Object oldlist; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1248 { |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1249 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
|
1250 return Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1251 } |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1252 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1253 /* 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
|
1254 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
|
1255 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1256 void |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1257 close_load_descs () |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1258 { |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1259 #ifndef WINDOWSNT |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1260 Lisp_Object tail; |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
1261 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
|
1262 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
|
1263 #endif |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1264 } |
341 | 1265 |
1266 static int | |
1267 complete_filename_p (pathname) | |
1268 Lisp_Object pathname; | |
1269 { | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1270 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
|
1271 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
|
1272 || (SCHARS (pathname) > 2 |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
1273 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2])) |
341 | 1274 #ifdef ALTOS |
1275 || *s == '@' | |
1276 #endif | |
1277 #ifdef VMS | |
1278 || index (s, ':') | |
1279 #endif /* VMS */ | |
1280 ); | |
1281 } | |
1282 | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1283 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
|
1284 doc: /* Search for FILENAME through PATH. |
62116
f1b7fe92d96a
(Flocate_file_internal): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
61623
diff
changeset
|
1285 Returns the file's name in absolute form, or nil if not found. |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1286 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
|
1287 file name when searching. |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1288 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
|
1289 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
|
1290 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
|
1291 (filename, path, suffixes, predicate) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1292 Lisp_Object filename, path, suffixes, predicate; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1293 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1294 Lisp_Object file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1295 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
|
1296 if (NILP (predicate) && fd > 0) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1297 close (fd); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1298 return file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1299 } |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1300 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1301 |
341 | 1302 /* Search for a file whose name is STR, looking in directories |
1303 in the Lisp list PATH, and trying suffixes from SUFFIX. | |
1304 On success, returns a file descriptor. On failure, returns -1. | |
1305 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1306 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
|
1307 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
|
1308 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1309 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
|
1310 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
|
1311 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
|
1312 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
|
1313 are ignored). |
341 | 1314 |
1315 If STOREPTR is nonzero, it points to a slot where the name of | |
1316 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
|
1317 nil is stored there on failure. |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1318 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1319 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
|
1320 but store the found remote file name in *STOREPTR. */ |
341 | 1321 |
1322 int | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1323 openp (path, str, suffixes, storeptr, predicate) |
341 | 1324 Lisp_Object path, str; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1325 Lisp_Object suffixes; |
341 | 1326 Lisp_Object *storeptr; |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1327 Lisp_Object predicate; |
341 | 1328 { |
1329 register int fd; | |
1330 int fn_size = 100; | |
1331 char buf[100]; | |
1332 register char *fn = buf; | |
1333 int absolute = 0; | |
1334 int want_size; | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1335 Lisp_Object filename; |
341 | 1336 struct stat st; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1337 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
|
1338 Lisp_Object string, tail, encoded_fn; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1339 int max_suffix_len = 0; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1340 |
51380
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1341 CHECK_STRING (str); |
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1342 |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1343 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
|
1344 { |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
1345 CHECK_STRING_CAR (tail); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1346 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
|
1347 SBYTES (XCAR (tail))); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1348 } |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1349 |
68649
70566c3d72b1
(openp): Initialized encoded_fn before GCPRO it.
Kenichi Handa <handa@m17n.org>
parents:
68301
diff
changeset
|
1350 string = filename = encoded_fn = Qnil; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1351 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
|
1352 |
341 | 1353 if (storeptr) |
1354 *storeptr = Qnil; | |
1355 | |
1356 if (complete_filename_p (str)) | |
1357 absolute = 1; | |
1358 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1359 for (; CONSP (path); path = XCDR (path)) |
341 | 1360 { |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1361 filename = Fexpand_file_name (str, XCAR (path)); |
341 | 1362 if (!complete_filename_p (filename)) |
1363 /* If there are non-absolute elts in PATH (eg ".") */ | |
1364 /* Of course, this could conceivably lose if luser sets | |
1365 default-directory to be something non-absolute... */ | |
1366 { | |
1367 filename = Fexpand_file_name (filename, current_buffer->directory); | |
1368 if (!complete_filename_p (filename)) | |
1369 /* Give up on this path element! */ | |
1370 continue; | |
1371 } | |
1372 | |
1373 /* Calculate maximum size of any filename made from | |
1374 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
|
1375 want_size = max_suffix_len + SBYTES (filename) + 1; |
341 | 1376 if (fn_size < want_size) |
1377 fn = (char *) alloca (fn_size = 100 + want_size); | |
1378 | |
1379 /* Loop over suffixes. */ | |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1380 for (tail = NILP (suffixes) ? Fcons (build_string (""), Qnil) : suffixes; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1381 CONSP (tail); tail = XCDR (tail)) |
341 | 1382 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1383 int lsuffix = SBYTES (XCAR (tail)); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1384 Lisp_Object handler; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1385 int exists; |
341 | 1386 |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1387 /* 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
|
1388 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
|
1389 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
|
1390 && 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
|
1391 && SREF (filename, 1) == ':') |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1392 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1393 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
|
1394 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
|
1395 fn[SBYTES (filename) - 2] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1396 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1397 else |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1398 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1399 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
|
1400 SBYTES (filename)); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1401 fn[SBYTES (filename)] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1402 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1403 |
341 | 1404 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
|
1405 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
|
1406 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1407 /* 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
|
1408 /* 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
|
1409 if (absolute) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1410 handler = Qnil; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1411 else |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1412 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
|
1413 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
|
1414 (load "/bar.el") where the file is actually "/bar.el.gz". */ |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1415 string = build_string (fn); |
50492
3a74e250f1a1
(openp): Get the Qfile_exists_p handler for STRING, not FN.
Richard M. Stallman <rms@gnu.org>
parents:
50138
diff
changeset
|
1416 handler = Ffind_file_name_handler (string, Qfile_exists_p); |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1417 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
|
1418 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1419 if (NILP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1420 exists = !NILP (Ffile_readable_p (string)); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1421 else |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1422 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
|
1423 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
|
1424 exists = 0; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1425 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1426 if (exists) |
341 | 1427 { |
1428 /* We succeeded; return this descriptor and filename. */ | |
1429 if (storeptr) | |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1430 *storeptr = string; |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1431 UNGCPRO; |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1432 return -2; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1433 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1434 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1435 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1436 { |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1437 const char *pfn; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1438 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1439 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
|
1440 pfn = SDATA (encoded_fn); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1441 exists = (stat (pfn, &st) >= 0 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1442 && (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
|
1443 if (exists) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1444 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1445 /* 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
|
1446 if (NATNUMP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1447 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
|
1448 else |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1449 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
|
1450 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1451 if (fd >= 0) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1452 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1453 /* 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
|
1454 if (storeptr) |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1455 *storeptr = string; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1456 UNGCPRO; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1457 return fd; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1458 } |
341 | 1459 } |
1460 } | |
1461 } | |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1462 if (absolute) |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1463 break; |
341 | 1464 } |
1465 | |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1466 UNGCPRO; |
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1467 return -1; |
341 | 1468 } |
1469 | |
1470 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1471 /* 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
|
1472 into the load_history variable. The details depend on whether |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1473 the source has an associated file name or not. |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1474 |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1475 FILENAME is the file name that we are loading from. |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1476 ENTIRE is 1 if loading that entire file, 0 if evaluating part of it. */ |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1477 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1478 static void |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1479 build_load_history (filename, entire) |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1480 Lisp_Object filename; |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1481 int entire; |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1482 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1483 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
|
1484 register Lisp_Object tem, tem2; |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1485 register int foundit = 0; |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1486 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1487 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
|
1488 prev = Qnil; |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1489 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1490 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
|
1491 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1492 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
|
1493 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1494 /* Find the feature's previous assoc list... */ |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1495 if (!NILP (Fequal (filename, Fcar (tem)))) |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1496 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1497 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
|
1498 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1499 /* If we're loading the entire file, remove old data. */ |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1500 if (entire) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1501 { |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1502 if (NILP (prev)) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1503 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
|
1504 else |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1505 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
|
1506 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1507 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1508 /* 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
|
1509 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1510 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1511 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
|
1512 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1513 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
|
1514 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1515 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
|
1516 |
47021
3bd4234e0844
(build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents:
46472
diff
changeset
|
1517 if (NILP (Fmember (newelt, tem))) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1518 Fsetcar (tail, Fcons (XCAR (tem), |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1519 Fcons (newelt, XCDR (tem)))); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1520 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1521 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
|
1522 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1523 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1524 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1525 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1526 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1527 prev = tail; |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1528 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
|
1529 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1530 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1531 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1532 /* If we're loading an entire file, cons the new assoc onto the |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1533 front of load-history, the most-recently-loaded position. Also |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1534 do this if we didn't find an existing member for the file. */ |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1535 if (entire || !foundit) |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
1536 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
|
1537 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
|
1538 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1539 |
341 | 1540 Lisp_Object |
30917
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1541 unreadpure (junk) /* Used as unwind-protect function in readevalloop */ |
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1542 Lisp_Object junk; |
341 | 1543 { |
1544 read_pure = 0; | |
1545 return Qnil; | |
1546 } | |
1547 | |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1548 static Lisp_Object |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1549 readevalloop_1 (old) |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1550 Lisp_Object old; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1551 { |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1552 load_convert_to_unibyte = ! NILP (old); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1553 return Qnil; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1554 } |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1555 |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1556 /* 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
|
1557 information. */ |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1558 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1559 static void |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1560 end_of_file_error () |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1561 { |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1562 Lisp_Object data; |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1563 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1564 if (STRINGP (Vload_file_name)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1565 xsignal1 (Qend_of_file, Vload_file_name); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1566 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1567 xsignal0 (Qend_of_file); |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1568 } |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1569 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1570 /* 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
|
1571 for this invocation. |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1572 READFUN, if non-nil, is used instead of `read'. |
70595
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1573 |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1574 START, END specify region to read in current buffer (from eval-region). |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1575 If the input is not from a buffer, they must be nil. */ |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1576 |
341 | 1577 static void |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1578 readevalloop (readcharfun, stream, sourcename, evalfun, |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1579 printflag, unibyte, readfun, start, end) |
341 | 1580 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
|
1581 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
|
1582 Lisp_Object sourcename; |
341 | 1583 Lisp_Object (*evalfun) (); |
1584 int printflag; | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1585 Lisp_Object unibyte, readfun; |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1586 Lisp_Object start, end; |
341 | 1587 { |
1588 register int c; | |
1589 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1590 int count = SPECPDL_INDEX (); |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1591 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1592 struct buffer *b = 0; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1593 int continue_reading_p; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1594 /* Nonzero if reading an entire buffer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1595 int whole_buffer = 0; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1596 /* 1 on the first time around. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1597 int first_sexp = 1; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1598 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1599 if (MARKERP (readcharfun)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1600 { |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1601 if (NILP (start)) |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1602 start = readcharfun; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1603 } |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1604 |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1605 if (BUFFERP (readcharfun)) |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1606 b = XBUFFER (readcharfun); |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1607 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
|
1608 b = XMARKER (readcharfun)->buffer; |
341 | 1609 |
70595
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1610 /* We assume START is nil when input is not from a buffer. */ |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1611 if (! NILP (start) && !b) |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1612 abort (); |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1613 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1614 specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun. */ |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
1615 specbind (Qcurrent_load_list, Qnil); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1616 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
|
1617 load_convert_to_unibyte = !NILP (unibyte); |
341 | 1618 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1619 GCPRO4 (sourcename, readfun, start, end); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1620 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1621 /* Try to ensure sourcename is a truename, except whilst preloading. */ |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1622 if (NILP (Vpurify_flag) |
71673
1404a22bd1f5
(readevalloop): Remove unused var `bpos'. Yet another int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71672
diff
changeset
|
1623 && !NILP (sourcename) && !NILP (Ffile_name_absolute_p (sourcename)) |
1404a22bd1f5
(readevalloop): Remove unused var `bpos'. Yet another int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71672
diff
changeset
|
1624 && !NILP (Ffboundp (Qfile_truename))) |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1625 sourcename = call1 (Qfile_truename, sourcename) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1626 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1627 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
|
1628 |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1629 continue_reading_p = 1; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1630 while (continue_reading_p) |
341 | 1631 { |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1632 int count1 = SPECPDL_INDEX (); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1633 |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1634 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
|
1635 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
|
1636 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1637 if (!NILP (start)) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1638 { |
67871
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1639 /* Switch to the buffer we are reading from. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1640 record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
67871
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1641 set_buffer_internal (b); |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1642 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1643 /* Save point in it. */ |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1644 record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1645 /* Save ZV in it. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1646 record_unwind_protect (save_restriction_restore, save_restriction_save ()); |
67871
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1647 /* Those get unbound after we read one expression. */ |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1648 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1649 /* Set point and ZV around stuff to be read. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1650 Fgoto_char (start); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1651 if (!NILP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1652 Fnarrow_to_region (make_number (BEGV), end); |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1653 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1654 /* Just for cleanliness, convert END to a marker |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1655 if it is an integer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1656 if (INTEGERP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1657 end = Fpoint_max_marker (); |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1658 } |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1659 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1660 /* On the first cycle, we can easily test here |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1661 whether we are reading the whole buffer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1662 if (b && first_sexp) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1663 whole_buffer = (PT == BEG && ZV == Z); |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1664 |
341 | 1665 instream = stream; |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1666 read_next: |
341 | 1667 c = READCHAR; |
1668 if (c == ';') | |
1669 { | |
1670 while ((c = READCHAR) != '\n' && c != -1); | |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1671 goto read_next; |
341 | 1672 } |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1673 if (c < 0) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1674 { |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1675 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1676 break; |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1677 } |
10163
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1678 |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1679 /* Ignore whitespace here, so we can detect eof. */ |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1680 if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r') |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1681 goto read_next; |
341 | 1682 |
485 | 1683 if (!NILP (Vpurify_flag) && c == '(') |
341 | 1684 { |
1685 record_unwind_protect (unreadpure, Qnil); | |
1686 val = read_list (-1, readcharfun); | |
1687 } | |
1688 else | |
1689 { | |
1690 UNREAD (c); | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1691 read_objects = Qnil; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1692 if (!NILP (readfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1693 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1694 val = call1 (readfun, readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1695 |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1696 /* 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
|
1697 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
|
1698 to a different value when evaluated. */ |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1699 if (BUFFERP (readcharfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1700 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1701 struct buffer *b = XBUFFER (readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1702 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
|
1703 continue_reading_p = 0; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1704 } |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1705 } |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1706 else if (! NILP (Vload_read_function)) |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1707 val = call1 (Vload_read_function, readcharfun); |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1708 else |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1709 val = read_internal_start (readcharfun, Qnil, Qnil); |
341 | 1710 } |
1711 | |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1712 if (!NILP (start) && continue_reading_p) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1713 start = Fpoint_marker (); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1714 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1715 /* Restore saved point and BEGV. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1716 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1717 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1718 /* Now eval what we just read. */ |
341 | 1719 val = (*evalfun) (val); |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1720 |
341 | 1721 if (printflag) |
1722 { | |
1723 Vvalues = Fcons (val, Vvalues); | |
1724 if (EQ (Vstandard_output, Qt)) | |
1725 Fprin1 (val, Qnil); | |
1726 else | |
1727 Fprint (val, Qnil); | |
1728 } | |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1729 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1730 first_sexp = 0; |
341 | 1731 } |
1732 | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1733 build_load_history (sourcename, |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1734 stream || whole_buffer); |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1735 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1736 UNGCPRO; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1737 |
341 | 1738 unbind_to (count, Qnil); |
1739 } | |
1740 | |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1741 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
|
1742 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
|
1743 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
|
1744 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
|
1745 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
|
1746 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
|
1747 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1748 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
|
1749 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
|
1750 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
|
1751 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
|
1752 |
48149
8f11dde95c66
(Feval_buffer): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
48087
diff
changeset
|
1753 The optional fifth argument DO-ALLOW-PRINT, if non-nil, specifies that |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1754 `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
|
1755 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1756 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
|
1757 (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
|
1758 Lisp_Object buffer, printflag, filename, unibyte, do_allow_print; |
672 | 1759 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1760 int count = SPECPDL_INDEX (); |
672 | 1761 Lisp_Object tem, buf; |
1762 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1763 if (NILP (buffer)) |
672 | 1764 buf = Fcurrent_buffer (); |
1765 else | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1766 buf = Fget_buffer (buffer); |
673 | 1767 if (NILP (buf)) |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1768 error ("No such buffer"); |
672 | 1769 |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1770 if (NILP (printflag) && NILP (do_allow_print)) |
672 | 1771 tem = Qsymbolp; |
1772 else | |
1773 tem = printflag; | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1774 |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1775 if (NILP (filename)) |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1776 filename = XBUFFER (buf)->filename; |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1777 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1778 specbind (Qeval_buffer_list, Fcons (buf, Veval_buffer_list)); |
672 | 1779 specbind (Qstandard_output, tem); |
1780 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1781 BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf))); | |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1782 readevalloop (buf, 0, filename, Feval, |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1783 !NILP (printflag), unibyte, Qnil, Qnil, Qnil); |
1924
21bd3a2189d3
* keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents:
1887
diff
changeset
|
1784 unbind_to (count, Qnil); |
672 | 1785 |
1786 return Qnil; | |
1787 } | |
1788 | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1789 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
|
1790 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
|
1791 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
|
1792 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
|
1793 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
|
1794 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
|
1795 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
|
1796 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
|
1797 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
|
1798 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
|
1799 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1800 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
|
1801 (start, end, printflag, read_function) |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1802 Lisp_Object start, end, printflag, read_function; |
341 | 1803 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1804 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
|
1805 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
|
1806 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1807 cbuf = Fcurrent_buffer (); |
341 | 1808 |
485 | 1809 if (NILP (printflag)) |
341 | 1810 tem = Qsymbolp; |
1811 else | |
1812 tem = printflag; | |
1813 specbind (Qstandard_output, tem); | |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1814 specbind (Qeval_buffer_list, Fcons (cbuf, Veval_buffer_list)); |
341 | 1815 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1816 /* readevalloop calls functions which check the type of start and end. */ |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1817 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1818 !NILP (printflag), Qnil, read_function, |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1819 start, end); |
341 | 1820 |
1821 return unbind_to (count, Qnil); | |
1822 } | |
1823 | |
1824 | |
1825 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
|
1826 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
|
1827 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
|
1828 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
|
1829 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
|
1830 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
|
1831 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
|
1832 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
|
1833 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
|
1834 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
|
1835 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
|
1836 (stream) |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1837 Lisp_Object stream; |
341 | 1838 { |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1839 if (NILP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1840 stream = Vstandard_input; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1841 if (EQ (stream, Qt)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1842 stream = Qread_char; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1843 if (EQ (stream, Qread_char)) |
341 | 1844 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); |
1845 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1846 return read_internal_start (stream, Qnil, Qnil); |
341 | 1847 } |
1848 | |
1849 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
|
1850 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
|
1851 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
|
1852 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
|
1853 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
|
1854 (string, start, end) |
341 | 1855 Lisp_Object string, start, end; |
1856 { | |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1857 Lisp_Object ret; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1858 CHECK_STRING (string); |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1859 /* read_internal_start sets read_from_string_index. */ |
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1860 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
|
1861 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
|
1862 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1863 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1864 /* 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
|
1865 calls. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1866 static Lisp_Object |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1867 read_internal_start (stream, start, end) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1868 Lisp_Object stream; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1869 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
|
1870 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
|
1871 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1872 Lisp_Object retval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1873 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1874 readchar_count = 0; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1875 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1876 read_objects = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1877 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1878 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1879 Vread_symbol_positions_list = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1880 |
89483 | 1881 if (STRINGP (stream) |
1882 || ((CONSP (stream) && STRINGP (XCAR (stream))))) | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1883 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1884 int startval, endval; |
89483 | 1885 Lisp_Object string; |
1886 | |
1887 if (STRINGP (stream)) | |
1888 string = stream; | |
1889 else | |
1890 string = XCAR (stream); | |
1891 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1892 if (NILP (end)) |
89483 | 1893 endval = SCHARS (string); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1894 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1895 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1896 CHECK_NUMBER (end); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1897 endval = XINT (end); |
89483 | 1898 if (endval < 0 || endval > SCHARS (string)) |
1899 args_out_of_range (string, end); | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1900 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1901 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1902 if (NILP (start)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1903 startval = 0; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1904 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1905 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1906 CHECK_NUMBER (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1907 startval = XINT (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1908 if (startval < 0 || startval > endval) |
89483 | 1909 args_out_of_range (string, start); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1910 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1911 read_from_string_index = startval; |
89483 | 1912 read_from_string_index_byte = string_char_to_byte (string, startval); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1913 read_from_string_limit = endval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1914 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
1915 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1916 retval = read0 (stream); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1917 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1918 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1919 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
|
1920 return retval; |
341 | 1921 } |
1922 | |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1923 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1924 /* Signal Qinvalid_read_syntax error. |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1925 S is error string of length N (if > 0) */ |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1926 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1927 static void |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1928 invalid_syntax (s, n) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1929 const char *s; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1930 int n; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1931 { |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1932 if (!n) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1933 n = strlen (s); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1934 xsignal1 (Qinvalid_read_syntax, make_string (s, n)); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1935 } |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1936 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1937 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1938 /* 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
|
1939 are not allowed. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1940 |
341 | 1941 static Lisp_Object |
1942 read0 (readcharfun) | |
1943 Lisp_Object readcharfun; | |
1944 { | |
1945 register Lisp_Object val; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1946 int c; |
341 | 1947 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1948 val = read1 (readcharfun, &c, 0); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1949 if (!c) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1950 return val; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1951 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1952 xsignal1 (Qinvalid_read_syntax, |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1953 Fmake_string (make_number (1), make_number (c))); |
341 | 1954 } |
1955 | |
1956 static int read_buffer_size; | |
1957 static char *read_buffer; | |
1958 | |
88886 | 1959 /* Read a \-escape sequence, assuming we already read the `\'. |
89483 | 1960 If the escape sequence forces unibyte, return eight-bit char. */ |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1961 |
17038 | 1962 static int |
88886 | 1963 read_escape (readcharfun, stringp) |
341 | 1964 Lisp_Object readcharfun; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1965 int stringp; |
341 | 1966 { |
1967 register int c = READCHAR; | |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
1968 /* \u allows up to four hex digits, \U up to eight. Default to the |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
1969 behaviour for \u, and change this value in the case that \U is seen. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
1970 int unicode_hex_count = 4; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1971 |
341 | 1972 switch (c) |
1973 { | |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1974 case -1: |
40931
50b111aed6d5
(read_escape): Use end_of_file_error for reporting eof.
Richard M. Stallman <rms@gnu.org>
parents:
40796
diff
changeset
|
1975 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
|
1976 |
341 | 1977 case 'a': |
485 | 1978 return '\007'; |
341 | 1979 case 'b': |
1980 return '\b'; | |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1981 case 'd': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1982 return 0177; |
341 | 1983 case 'e': |
1984 return 033; | |
1985 case 'f': | |
1986 return '\f'; | |
1987 case 'n': | |
1988 return '\n'; | |
1989 case 'r': | |
1990 return '\r'; | |
1991 case 't': | |
1992 return '\t'; | |
1993 case 'v': | |
1994 return '\v'; | |
1995 case '\n': | |
1996 return -1; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1997 case ' ': |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1998 if (stringp) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1999 return -1; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2000 return ' '; |
341 | 2001 |
2002 case 'M': | |
2003 c = READCHAR; | |
2004 if (c != '-') | |
2005 error ("Invalid escape character syntax"); | |
2006 c = READCHAR; | |
2007 if (c == '\\') | |
88886 | 2008 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2009 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
|
2010 |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2011 case 'S': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2012 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2013 if (c != '-') |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2014 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
|
2015 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2016 if (c == '\\') |
88886 | 2017 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2018 return c | shift_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2019 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2020 case 'H': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2021 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2022 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2023 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2024 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2025 if (c == '\\') |
88886 | 2026 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2027 return c | hyper_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2028 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2029 case 'A': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2030 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2031 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2032 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2033 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2034 if (c == '\\') |
88886 | 2035 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2036 return c | alt_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2037 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2038 case 's': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2039 c = READCHAR; |
67394
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2040 if (c != '-') |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2041 { |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2042 UNREAD (c); |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2043 return ' '; |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2044 } |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2045 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2046 if (c == '\\') |
88886 | 2047 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2048 return c | super_modifier; |
341 | 2049 |
2050 case 'C': | |
2051 c = READCHAR; | |
2052 if (c != '-') | |
2053 error ("Invalid escape character syntax"); | |
2054 case '^': | |
2055 c = READCHAR; | |
2056 if (c == '\\') | |
88886 | 2057 c = read_escape (readcharfun, 0); |
25251
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2058 if ((c & ~CHAR_MODIFIER_MASK) == '?') |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2059 return 0177 | (c & CHAR_MODIFIER_MASK); |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2060 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
|
2061 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
|
2062 /* 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
|
2063 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
|
2064 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
|
2065 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
|
2066 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
|
2067 return (c & (037 | ~0177)); |
341 | 2068 else |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2069 return c | ctrl_modifier; |
341 | 2070 |
2071 case '0': | |
2072 case '1': | |
2073 case '2': | |
2074 case '3': | |
2075 case '4': | |
2076 case '5': | |
2077 case '6': | |
2078 case '7': | |
2079 /* An octal escape, as in ANSI C. */ | |
2080 { | |
2081 register int i = c - '0'; | |
2082 register int count = 0; | |
2083 while (++count < 3) | |
2084 { | |
2085 if ((c = READCHAR) >= '0' && c <= '7') | |
2086 { | |
2087 i *= 8; | |
2088 i += c - '0'; | |
2089 } | |
2090 else | |
2091 { | |
2092 UNREAD (c); | |
2093 break; | |
2094 } | |
2095 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2096 |
89483 | 2097 if (i >= 0x80 && i < 0x100) |
88886 | 2098 i = BYTE8_TO_CHAR (i); |
341 | 2099 return i; |
2100 } | |
2101 | |
2102 case 'x': | |
2103 /* A hex escape, as in ANSI C. */ | |
2104 { | |
2105 int i = 0; | |
88383 | 2106 int count = 0; |
341 | 2107 while (1) |
2108 { | |
2109 c = READCHAR; | |
2110 if (c >= '0' && c <= '9') | |
2111 { | |
2112 i *= 16; | |
2113 i += c - '0'; | |
2114 } | |
2115 else if ((c >= 'a' && c <= 'f') | |
2116 || (c >= 'A' && c <= 'F')) | |
2117 { | |
2118 i *= 16; | |
2119 if (c >= 'a' && c <= 'f') | |
2120 i += c - 'a' + 10; | |
2121 else | |
2122 i += c - 'A' + 10; | |
2123 } | |
2124 else | |
2125 { | |
2126 UNREAD (c); | |
2127 break; | |
2128 } | |
88383 | 2129 count++; |
341 | 2130 } |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2131 |
88383 | 2132 if (count < 3 && i >= 0x80) |
88886 | 2133 return BYTE8_TO_CHAR (i); |
341 | 2134 return i; |
2135 } | |
2136 | |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2137 case 'U': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2138 /* Post-Unicode-2.0: Up to eight hex chars. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2139 unicode_hex_count = 8; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2140 case 'u': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2141 |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2142 /* A Unicode escape. We only permit them in strings and characters, |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2143 not arbitrarily in the source code, as in some other languages. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2144 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2145 int i = 0; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2146 int count = 0; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2147 |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2148 while (++count <= unicode_hex_count) |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2149 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2150 c = READCHAR; |
71484
dbe1bcee0357
Fix whitespace of last change.
Eli Zaretskii <eliz@gnu.org>
parents:
71458
diff
changeset
|
2151 /* isdigit and isalpha may be locale-specific, which we don't |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2152 want. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2153 if (c >= '0' && c <= '9') i = (i << 4) + (c - '0'); |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2154 else if (c >= 'a' && c <= 'f') i = (i << 4) + (c - 'a') + 10; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2155 else if (c >= 'A' && c <= 'F') i = (i << 4) + (c - 'A') + 10; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2156 else |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2157 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2158 error ("Non-hex digit used for Unicode escape"); |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2159 break; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2160 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2161 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2162 |
90478
65a8f4ffdbca
(read_escape): Fix the code synched with HEAD.
Kenichi Handa <handa@m17n.org>
parents:
90472
diff
changeset
|
2163 return i; |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2164 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2165 |
341 | 2166 default: |
2167 return c; | |
2168 } | |
2169 } | |
2170 | |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2171 /* Read an integer in radix RADIX using READCHARFUN to read |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2172 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
|
2173 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
|
2174 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
|
2175 range. */ |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2176 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2177 static Lisp_Object |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2178 read_integer (readcharfun, radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2179 Lisp_Object readcharfun; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2180 int radix; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2181 { |
35543
c809110e1433
(read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents:
34604
diff
changeset
|
2182 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
|
2183 EMACS_INT number = 0; |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2184 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2185 if (radix < 2 || radix > 36) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2186 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2187 else |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2188 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2189 number = ndigits = invalid_p = 0; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2190 sign = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2191 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2192 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2193 if (c == '-') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2194 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2195 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2196 sign = -1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2197 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2198 else if (c == '+') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2199 c = READCHAR; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2200 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2201 while (c >= 0) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2202 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2203 int digit; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2204 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2205 if (c >= '0' && c <= '9') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2206 digit = c - '0'; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2207 else if (c >= 'a' && c <= 'z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2208 digit = c - 'a' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2209 else if (c >= 'A' && c <= 'Z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2210 digit = c - 'A' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2211 else |
28190
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2212 { |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2213 UNREAD (c); |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2214 break; |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2215 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2216 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2217 if (digit < 0 || digit >= radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2218 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2219 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2220 number = radix * number + digit; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2221 ++ndigits; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2222 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2223 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2224 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2225 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2226 if (ndigits == 0 || invalid_p) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2227 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2228 char buf[50]; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2229 sprintf (buf, "integer, radix %d", radix); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2230 invalid_syntax (buf, 0); |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2231 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2232 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2233 return make_number (sign * number); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2234 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2235 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2236 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2237 /* 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
|
2238 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
|
2239 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
|
2240 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2241 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
|
2242 |
341 | 2243 static Lisp_Object |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2244 read1 (readcharfun, pch, first_in_list) |
341 | 2245 register Lisp_Object readcharfun; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2246 int *pch; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2247 int first_in_list; |
341 | 2248 { |
2249 register int c; | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2250 int uninterned_symbol = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2251 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2252 *pch = 0; |
88886 | 2253 load_each_byte = 0; |
341 | 2254 |
2255 retry: | |
2256 | |
2257 c = READCHAR; | |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2258 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2259 end_of_file_error (); |
341 | 2260 |
2261 switch (c) | |
2262 { | |
2263 case '(': | |
2264 return read_list (0, readcharfun); | |
2265 | |
2266 case '[': | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2267 return read_vector (readcharfun, 0); |
341 | 2268 |
2269 case ')': | |
2270 case ']': | |
2271 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2272 *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
|
2273 return Qnil; |
341 | 2274 } |
2275 | |
2276 case '#': | |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2277 c = READCHAR; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2278 if (c == '^') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2279 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2280 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2281 if (c == '[') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2282 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2283 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2284 tmp = read_vector (readcharfun, 0); |
89996
d13df8a735d7
(read1): Fix reading of a char-table.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2285 if (XVECTOR (tmp)->size < VECSIZE (struct Lisp_Char_Table)) |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2286 error ("Invalid size char-table"); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2287 XSETCHAR_TABLE (tmp, XCHAR_TABLE (tmp)); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2288 return tmp; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2289 } |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2290 else if (c == '^') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2291 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2292 c = READCHAR; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2293 if (c == '[') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2294 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2295 Lisp_Object tmp; |
88383 | 2296 int depth, size; |
89483 | 2297 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2298 tmp = read_vector (readcharfun, 0); |
88383 | 2299 if (!INTEGERP (AREF (tmp, 0))) |
2300 error ("Invalid depth in char-table"); | |
2301 depth = XINT (AREF (tmp, 0)); | |
2302 if (depth < 1 || depth > 3) | |
2303 error ("Invalid depth in char-table"); | |
89996
d13df8a735d7
(read1): Fix reading of a char-table.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2304 size = XVECTOR (tmp)->size - 2; |
88383 | 2305 if (chartab_size [depth] != size) |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2306 error ("Invalid size char-table"); |
88383 | 2307 XSETSUB_CHAR_TABLE (tmp, XSUB_CHAR_TABLE (tmp)); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2308 return tmp; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2309 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2310 invalid_syntax ("#^^", 3); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2311 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2312 invalid_syntax ("#^", 2); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2313 } |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2314 if (c == '&') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2315 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2316 Lisp_Object length; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2317 length = read1 (readcharfun, pch, first_in_list); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2318 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2319 if (c == '"') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2320 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2321 Lisp_Object tmp, val; |
55158
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2322 int size_in_chars |
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2323 = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1) |
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2324 / BOOL_VECTOR_BITS_PER_CHAR); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2325 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2326 UNREAD (c); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2327 tmp = read1 (readcharfun, pch, first_in_list); |
88886 | 2328 if (STRING_MULTIBYTE (tmp) |
89483 | 2329 || (size_in_chars != SCHARS (tmp) |
88886 | 2330 /* We used to print 1 char too many |
2331 when the number of bits was a multiple of 8. | |
2332 Accept such input in case it came from an old | |
2333 version. */ | |
2334 && ! (XFASTINT (length) | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2335 == (SCHARS (tmp) - 1) * BOOL_VECTOR_BITS_PER_CHAR))) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2336 invalid_syntax ("#&...", 5); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2337 |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2338 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
|
2339 bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data, |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2340 size_in_chars); |
21935
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
2341 /* Clear the extraneous bits in the last byte. */ |
55158
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2342 if (XINT (length) != size_in_chars * BOOL_VECTOR_BITS_PER_CHAR) |
21935
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
2343 XBOOL_VECTOR (val)->data[size_in_chars - 1] |
55158
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2344 &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2345 return val; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2346 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2347 invalid_syntax ("#&...", 5); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2348 } |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2349 if (c == '[') |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2350 { |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2351 /* 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
|
2352 build them using function calls. */ |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2353 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2354 tmp = read_vector (readcharfun, 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2355 return Fmake_byte_code (XVECTOR (tmp)->size, |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2356 XVECTOR (tmp)->contents); |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2357 } |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2358 if (c == '(') |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2359 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2360 Lisp_Object tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2361 struct gcpro gcpro1; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2362 int ch; |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2363 |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2364 /* 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
|
2365 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
|
2366 if (ch != 0 || !STRINGP (tmp)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2367 invalid_syntax ("#", 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2368 GCPRO1 (tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2369 /* Read the intervals and their properties. */ |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2370 while (1) |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2371 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2372 Lisp_Object beg, end, plist; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2373 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2374 beg = read1 (readcharfun, &ch, 0); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
2375 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
|
2376 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
|
2377 break; |
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2378 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2379 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
|
2380 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2381 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
|
2382 if (ch) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2383 invalid_syntax ("Invalid string property list", 0); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2384 Fset_text_properties (beg, end, plist, tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2385 } |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2386 UNGCPRO; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2387 return tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2388 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2389 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2390 /* #@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
|
2391 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
|
2392 and function definitions. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2393 if (c == '@') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2394 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2395 int i, nskip = 0; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2396 |
88886 | 2397 load_each_byte = 1; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2398 /* Read a decimal integer. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2399 while ((c = READCHAR) >= 0 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2400 && c >= '0' && c <= '9') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2401 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2402 nskip *= 10; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2403 nskip += c - '0'; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2404 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2405 if (c >= 0) |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2406 UNREAD (c); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2407 |
88886 | 2408 if (load_force_doc_strings |
2409 && (EQ (readcharfun, Qget_file_char) | |
2410 || EQ (readcharfun, Qget_emacs_mule_file_char))) | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2411 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2412 /* 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
|
2413 record the last string that we skipped, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2414 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
|
2415 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2416 /* But first exchange saved_doc_string |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2417 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
|
2418 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2419 char *temp = saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2420 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
|
2421 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
|
2422 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
|
2423 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2424 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
|
2425 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
|
2426 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
|
2427 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
|
2428 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2429 prev_saved_doc_string = temp; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2430 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
|
2431 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
|
2432 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
|
2433 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2434 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2435 if (saved_doc_string_size == 0) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2436 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2437 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
|
2438 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
|
2439 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2440 if (nskip > saved_doc_string_size) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2441 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2442 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
|
2443 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
|
2444 saved_doc_string_size); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2445 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2446 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
2447 saved_doc_string_position = file_tell (instream); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2448 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2449 /* Copy that many characters into saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2450 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2451 saved_doc_string[i] = c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2452 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2453 saved_doc_string_length = i; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2454 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2455 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2456 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2457 /* Skip that many characters. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2458 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2459 c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2460 } |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
2461 |
88886 | 2462 load_each_byte = 0; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2463 goto retry; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2464 } |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2465 if (c == '!') |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2466 { |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2467 /* #! 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
|
2468 Skip the first line. */ |
50138
75ed0f4a2f18
(read1): After #!, exit loop on eof.
Richard M. Stallman <rms@gnu.org>
parents:
49979
diff
changeset
|
2469 while (c != '\n' && c >= 0) |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2470 c = READCHAR; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2471 goto retry; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2472 } |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2473 if (c == '$') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2474 return Vload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2475 if (c == '\'') |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2476 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
|
2477 /* #: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
|
2478 if (c == ':') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2479 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2480 uninterned_symbol = 1; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2481 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2482 goto default_label; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2483 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2484 /* 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
|
2485 if (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2486 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2487 int n = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2488 Lisp_Object tem; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2489 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2490 /* Read a non-negative integer. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2491 while (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2492 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2493 n *= 10; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2494 n += c - '0'; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2495 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2496 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2497 /* #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
|
2498 if (c == '=') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2499 { |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2500 /* 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
|
2501 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2502 Lisp_Object cell; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2503 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2504 placeholder = Fcons(Qnil, Qnil); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2505 cell = Fcons (make_number (n), placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2506 read_objects = Fcons (cell, read_objects); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2507 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2508 /* Read the object itself. */ |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2509 tem = read0 (readcharfun); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2510 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2511 /* 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
|
2512 substitute_object_in_subtree (tem, placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2513 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2514 /* ...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
|
2515 Fsetcdr (cell, tem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2516 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2517 return tem; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2518 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2519 /* #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
|
2520 if (c == '#') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2521 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2522 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
|
2523 if (CONSP (tem)) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2524 return XCDR (tem); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2525 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2526 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2527 else if (c == 'r' || c == 'R') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2528 return read_integer (readcharfun, n); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2529 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2530 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2531 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2532 else if (c == 'x' || c == 'X') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2533 return read_integer (readcharfun, 16); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2534 else if (c == 'o' || c == 'O') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2535 return read_integer (readcharfun, 8); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2536 else if (c == 'b' || c == 'B') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2537 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
|
2538 |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2539 UNREAD (c); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2540 invalid_syntax ("#", 1); |
341 | 2541 |
2542 case ';': | |
2543 while ((c = READCHAR) >= 0 && c != '\n'); | |
2544 goto retry; | |
2545 | |
2546 case '\'': | |
2547 { | |
2548 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil)); | |
2549 } | |
2550 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2551 case '`': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2552 if (first_in_list) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2553 goto default_label; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2554 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2555 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2556 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2557 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2558 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2559 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2560 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2561 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2562 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
|
2563 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2564 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2565 case ',': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2566 if (new_backquote_flag) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2567 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2568 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
|
2569 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2570 int ch = READCHAR; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2571 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2572 if (ch == '@') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2573 comma_type = Qcomma_at; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2574 else if (ch == '.') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2575 comma_type = Qcomma_dot; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2576 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2577 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2578 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
|
2579 comma_type = Qcomma; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2580 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2581 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2582 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2583 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2584 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2585 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
|
2586 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2587 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2588 goto default_label; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2589 |
341 | 2590 case '?': |
2591 { | |
88886 | 2592 int modifiers; |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2593 int next_char; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2594 int ok; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2595 |
341 | 2596 c = READCHAR; |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2597 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2598 end_of_file_error (); |
341 | 2599 |
49979
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2600 /* Accept `single space' syntax like (list ? x) where the |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2601 whitespace character is SPC or TAB. |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2602 Other literal whitespace like NL, CR, and FF are not accepted, |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2603 as there are well-established escape sequences for these. */ |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2604 if (c == ' ' || c == '\t') |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2605 return make_number (c); |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2606 |
341 | 2607 if (c == '\\') |
88886 | 2608 c = read_escape (readcharfun, 0); |
2609 modifiers = c & CHAR_MODIFIER_MASK; | |
2610 c &= ~CHAR_MODIFIER_MASK; | |
2611 if (CHAR_BYTE8_P (c)) | |
2612 c = CHAR_TO_BYTE8 (c); | |
2613 c |= modifiers; | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2614 |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2615 next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2616 if (next_char == '.') |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2617 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2618 /* Only a dotted-pair dot is valid after a char constant. */ |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2619 int next_next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2620 UNREAD (next_next_char); |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2621 |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2622 ok = (next_next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2623 || (next_next_char < 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2624 && (index ("\"';([#?", next_next_char) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2625 || (!first_in_list && next_next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2626 || (new_backquote_flag && next_next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2627 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2628 else |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2629 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2630 ok = (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2631 || (next_char < 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2632 && (index ("\"';()[]#?", next_char) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2633 || (!first_in_list && next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2634 || (new_backquote_flag && next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2635 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2636 UNREAD (next_char); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2637 if (ok) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2638 return make_number (c); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2639 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2640 invalid_syntax ("?", 1); |
341 | 2641 } |
2642 | |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
2643 case '"': |
341 | 2644 { |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2645 char *p = read_buffer; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2646 char *end = read_buffer + read_buffer_size; |
341 | 2647 register int c; |
88383 | 2648 /* Nonzero if we saw an escape sequence specifying |
2649 a multibyte character. */ | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2650 int force_multibyte = 0; |
88383 | 2651 /* Nonzero 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
|
2652 a single-byte character. */ |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2653 int force_singlebyte = 0; |
341 | 2654 int cancel = 0; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2655 int nchars = 0; |
341 | 2656 |
2657 while ((c = READCHAR) >= 0 | |
2658 && c != '\"') | |
2659 { | |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2660 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2661 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2662 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2663 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
|
2664 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2665 p = read_buffer + offset; |
341 | 2666 end = read_buffer + read_buffer_size; |
2667 } | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2668 |
341 | 2669 if (c == '\\') |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2670 { |
88383 | 2671 int modifiers; |
88886 | 2672 |
2673 c = read_escape (readcharfun, 1); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2674 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2675 /* 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
|
2676 if (c == -1) |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2677 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2678 if (p == read_buffer) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2679 cancel = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2680 continue; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2681 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2682 |
88383 | 2683 modifiers = c & CHAR_MODIFIER_MASK; |
2684 c = c & ~CHAR_MODIFIER_MASK; | |
2685 | |
88886 | 2686 if (CHAR_BYTE8_P (c)) |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2687 force_singlebyte = 1; |
88886 | 2688 else if (! ASCII_CHAR_P (c)) |
2689 force_multibyte = 1; | |
2690 else /* i.e. ASCII_CHAR_P (c) */ | |
88383 | 2691 { |
2692 /* Allow `\C- ' and `\C-?'. */ | |
2693 if (modifiers == CHAR_CTL) | |
2694 { | |
2695 if (c == ' ') | |
2696 c = 0, modifiers = 0; | |
2697 else if (c == '?') | |
2698 c = 127, modifiers = 0; | |
2699 } | |
2700 if (modifiers & CHAR_SHIFT) | |
2701 { | |
2702 /* Shift modifier is valid only with [A-Za-z]. */ | |
2703 if (c >= 'A' && c <= 'Z') | |
2704 modifiers &= ~CHAR_SHIFT; | |
2705 else if (c >= 'a' && c <= 'z') | |
2706 c -= ('a' - 'A'), modifiers &= ~CHAR_SHIFT; | |
2707 } | |
2708 | |
2709 if (modifiers & CHAR_META) | |
2710 { | |
2711 /* Move the meta bit to the right place for a | |
2712 string. */ | |
2713 modifiers &= ~CHAR_META; | |
2714 c = BYTE8_TO_CHAR (c | 0x80); | |
2715 force_singlebyte = 1; | |
2716 } | |
2717 } | |
2718 | |
2719 /* Any modifiers remaining are invalid. */ | |
2720 if (modifiers) | |
2721 error ("Invalid modifier in string"); | |
2722 p += CHAR_STRING (c, (unsigned char *) p); | |
341 | 2723 } |
88886 | 2724 else |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
2725 { |
88383 | 2726 p += CHAR_STRING (c, (unsigned char *) p); |
89453
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2727 if (CHAR_BYTE8_P (c)) |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2728 force_singlebyte = 1; |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2729 else if (! ASCII_CHAR_P (c)) |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2730 force_multibyte = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2731 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2732 nchars++; |
341 | 2733 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2734 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2735 if (c < 0) |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2736 end_of_file_error (); |
341 | 2737 |
2738 /* If purifying, and string starts with \ newline, | |
2739 return zero instead. This is for doc strings | |
604 | 2740 that we are really going to find in etc/DOC.nn.nn */ |
485 | 2741 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) |
341 | 2742 return make_number (0); |
2743 | |
88383 | 2744 if (force_multibyte) |
2745 /* READ_BUFFER already contains valid multibyte forms. */ | |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2746 ; |
88383 | 2747 else if (force_singlebyte) |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2748 { |
88383 | 2749 nchars = str_as_unibyte (read_buffer, p - read_buffer); |
2750 p = read_buffer + nchars; | |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2751 } |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2752 else |
88383 | 2753 /* Otherwise, READ_BUFFER contains only ASCII. */ |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2754 ; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2755 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2756 /* 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
|
2757 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
|
2758 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
|
2759 READCHAR *does* read multibyte characters from buffers. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2760 /* readchar_count -= (p - read_buffer) - nchars; */ |
341 | 2761 if (read_pure) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2762 return make_pure_string (read_buffer, nchars, p - read_buffer, |
88383 | 2763 (force_multibyte |
2764 || (p - read_buffer != nchars))); | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2765 return make_specified_string (read_buffer, nchars, p - read_buffer, |
88383 | 2766 (force_multibyte |
2767 || (p - read_buffer != nchars))); | |
341 | 2768 } |
2769 | |
762 | 2770 case '.': |
2771 { | |
2772 int next_char = READCHAR; | |
2773 UNREAD (next_char); | |
2774 | |
28746
42f2ded9d9db
(read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents:
28733
diff
changeset
|
2775 if (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2776 || (next_char < 0200 |
58093
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2777 && (index ("\"';([#?", next_char) |
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2778 || (!first_in_list && next_char == '`') |
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2779 || (new_backquote_flag && next_char == ',')))) |
762 | 2780 { |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2781 *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
|
2782 return Qnil; |
762 | 2783 } |
2784 | |
2785 /* Otherwise, we fall through! Note that the atom-reading loop | |
2786 below will now loop at least once, assuring that we will not | |
2787 try to UNREAD two characters in a row. */ | |
2788 } | |
341 | 2789 default: |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2790 default_label: |
341 | 2791 if (c <= 040) goto retry; |
2792 { | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2793 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
|
2794 int quoted = 0; |
341 | 2795 |
2796 { | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2797 char *end = read_buffer + read_buffer_size; |
341 | 2798 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2799 while (c > 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2800 && (c >= 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2801 || (!index ("\"';()[]#", c) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2802 && !(!first_in_list && c == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2803 && !(new_backquote_flag && c == ',')))) |
341 | 2804 { |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2805 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2806 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2807 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2808 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
|
2809 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2810 p = read_buffer + offset; |
341 | 2811 end = read_buffer + read_buffer_size; |
2812 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2813 |
341 | 2814 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
|
2815 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2816 c = READCHAR; |
34604
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2817 if (c == -1) |
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2818 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
|
2819 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
|
2820 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2821 |
88886 | 2822 p += CHAR_STRING (c, p); |
341 | 2823 c = READCHAR; |
2824 } | |
2825 | |
2826 if (p == end) | |
2827 { | |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2828 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2829 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
|
2830 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2831 p = read_buffer + offset; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2832 end = read_buffer + read_buffer_size; |
341 | 2833 } |
2834 *p = 0; | |
2835 if (c >= 0) | |
2836 UNREAD (c); | |
2837 } | |
2838 | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2839 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
|
2840 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2841 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
|
2842 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
|
2843 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
|
2844 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
|
2845 /* 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
|
2846 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
|
2847 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2848 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
|
2849 /* 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
|
2850 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
|
2851 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
|
2852 /* 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
|
2853 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2854 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
|
2855 p1[-1] = '\0'; |
89070 | 2856 /* Fixme: if we have strtol, use that, and check |
2857 for overflow. */ | |
11699
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2858 if (sizeof (int) == sizeof (EMACS_INT)) |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2859 XSETINT (val, atoi (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2860 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
|
2861 XSETINT (val, atol (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2862 else |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2863 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
|
2864 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
|
2865 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2866 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2867 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
|
2868 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2869 /* 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
|
2870 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
|
2871 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
|
2872 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
|
2873 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2874 double value; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2875 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2876 /* 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
|
2877 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
|
2878 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
|
2879 drops the sign. */ |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2880 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
|
2881 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2882 /* 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
|
2883 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
|
2884 switch (p[-1]) |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2885 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2886 case 'F': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2887 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
|
2888 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2889 case 'N': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2890 value = zero / zero; |
63755
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2891 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2892 /* If that made a "negative" NaN, negate it. */ |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2893 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2894 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2895 int i; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2896 union { double d; char c[sizeof (double)]; } u_data, u_minus_zero; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2897 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2898 u_data.d = value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2899 u_minus_zero.d = - 0.0; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2900 for (i = 0; i < sizeof (double); i++) |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2901 if (u_data.c[i] & u_minus_zero.c[i]) |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2902 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2903 value = - value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2904 break; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2905 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2906 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2907 /* Now VALUE is a positive NaN. */ |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2908 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2909 default: |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2910 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
|
2911 break; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2912 } |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2913 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2914 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
|
2915 } |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2916 } |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2917 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2918 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
|
2919 : intern (read_buffer); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2920 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2921 || EQ (Vread_with_symbol_positions, readcharfun)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2922 Vread_symbol_positions_list = |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2923 /* 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
|
2924 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
|
2925 deal, though. */ |
45747
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
2926 Fcons (Fcons (result, |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
2927 make_number (readchar_count |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
2928 - XFASTINT (Flength (Fsymbol_name (result))))), |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2929 Vread_symbol_positions_list); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2930 return result; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2931 } |
341 | 2932 } |
2933 } | |
2934 } | |
2935 | |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2936 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2937 /* 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
|
2938 static Lisp_Object seen_list; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2939 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2940 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2941 substitute_object_in_subtree (object, placeholder) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2942 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2943 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2944 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2945 Lisp_Object check_object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2946 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2947 /* 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
|
2948 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2949 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2950 /* Make all the substitutions. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2951 check_object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2952 = substitute_object_recurse (object, placeholder, object); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2953 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2954 /* 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
|
2955 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2956 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2957 /* 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
|
2958 original. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2959 if (!EQ (check_object, object)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2960 error ("Unexpected mutation error in reader"); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2961 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2962 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2963 /* 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
|
2964 #define SUBSTITUTE(get_val, set_val) \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2965 { \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2966 Lisp_Object old_value = get_val; \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2967 Lisp_Object true_value \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2968 = substitute_object_recurse (object, placeholder,\ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2969 old_value); \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2970 \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2971 if (!EQ (old_value, true_value)) \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2972 { \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2973 set_val; \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2974 } \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2975 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2976 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2977 static Lisp_Object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2978 substitute_object_recurse (object, placeholder, subtree) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2979 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2980 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2981 Lisp_Object subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2982 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2983 /* 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
|
2984 if (EQ (placeholder, subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2985 return object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2986 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2987 /* 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
|
2988 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
|
2989 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2990 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2991 /* 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
|
2992 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
|
2993 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
|
2994 read_objects. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2995 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
|
2996 seen_list = Fcons (subtree, seen_list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2997 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2998 /* Recurse according to subtree's type. |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2999 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
|
3000 switch (XTYPE (subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3001 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3002 case Lisp_Vectorlike: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3003 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3004 int i; |
28507
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28388
diff
changeset
|
3005 int length = XINT (Flength(subtree)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3006 for (i = 0; i < length; i++) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3007 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3008 Lisp_Object idx = make_number (i); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3009 SUBSTITUTE (Faref (subtree, idx), |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3010 Faset (subtree, idx, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3011 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3012 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3013 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3014 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3015 case Lisp_Cons: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3016 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3017 SUBSTITUTE (Fcar_safe (subtree), |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3018 Fsetcar (subtree, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3019 SUBSTITUTE (Fcdr_safe (subtree), |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3020 Fsetcdr (subtree, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3021 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3022 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3023 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3024 case Lisp_String: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3025 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3026 /* 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
|
3027 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
|
3028 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3029 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
|
3030 Lisp_Object arg = Fcons (object, placeholder); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3031 |
39857
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3032 traverse_intervals_noorder (root_interval, |
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3033 &substitute_in_interval, arg); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3034 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3035 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3036 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3037 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3038 /* 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
|
3039 default: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3040 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3041 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3042 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3043 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3044 /* Helper function for substitute_object_recurse. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3045 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3046 substitute_in_interval (interval, arg) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3047 INTERVAL interval; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3048 Lisp_Object arg; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3049 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3050 Lisp_Object object = Fcar (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3051 Lisp_Object placeholder = Fcdr (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3052 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3053 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
|
3054 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3055 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3056 |
341 | 3057 #define LEAD_INT 1 |
3058 #define DOT_CHAR 2 | |
3059 #define TRAIL_INT 4 | |
3060 #define E_CHAR 8 | |
3061 #define EXP_INT 16 | |
3062 | |
3063 int | |
3064 isfloat_string (cp) | |
3065 register char *cp; | |
3066 { | |
21799 | 3067 register int state; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3068 |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3069 char *start = cp; |
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3070 |
341 | 3071 state = 0; |
3072 if (*cp == '+' || *cp == '-') | |
3073 cp++; | |
3074 | |
9871 | 3075 if (*cp >= '0' && *cp <= '9') |
341 | 3076 { |
3077 state |= LEAD_INT; | |
9871 | 3078 while (*cp >= '0' && *cp <= '9') |
3079 cp++; | |
341 | 3080 } |
3081 if (*cp == '.') | |
3082 { | |
3083 state |= DOT_CHAR; | |
3084 cp++; | |
3085 } | |
9871 | 3086 if (*cp >= '0' && *cp <= '9') |
341 | 3087 { |
3088 state |= TRAIL_INT; | |
9871 | 3089 while (*cp >= '0' && *cp <= '9') |
341 | 3090 cp++; |
3091 } | |
16342
b91af71f45f1
(isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents:
16228
diff
changeset
|
3092 if (*cp == 'e' || *cp == 'E') |
341 | 3093 { |
3094 state |= E_CHAR; | |
3095 cp++; | |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3096 if (*cp == '+' || *cp == '-') |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3097 cp++; |
341 | 3098 } |
3099 | |
9871 | 3100 if (*cp >= '0' && *cp <= '9') |
341 | 3101 { |
3102 state |= EXP_INT; | |
9871 | 3103 while (*cp >= '0' && *cp <= '9') |
341 | 3104 cp++; |
3105 } | |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3106 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
|
3107 ; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3108 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
|
3109 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3110 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3111 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3112 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3113 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
|
3114 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3115 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3116 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3117 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3118 |
11172
e1ca77e22c12
(isfloat_string): Permit trailing space.
Richard M. Stallman <rms@gnu.org>
parents:
11079
diff
changeset
|
3119 return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) |
341 | 3120 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) |
826 | 3121 || state == (DOT_CHAR|TRAIL_INT) |
341 | 3122 || state == (LEAD_INT|E_CHAR|EXP_INT) |
826 | 3123 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT) |
3124 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT))); | |
341 | 3125 } |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27645
diff
changeset
|
3126 |
341 | 3127 |
3128 static Lisp_Object | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3129 read_vector (readcharfun, bytecodeflag) |
341 | 3130 Lisp_Object readcharfun; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3131 int bytecodeflag; |
341 | 3132 { |
3133 register int i; | |
3134 register int size; | |
3135 register Lisp_Object *ptr; | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3136 register Lisp_Object tem, item, vector; |
341 | 3137 register struct Lisp_Cons *otem; |
3138 Lisp_Object len; | |
3139 | |
3140 tem = read_list (1, readcharfun); | |
3141 len = Flength (tem); | |
3142 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil)); | |
3143 | |
3144 size = XVECTOR (vector)->size; | |
3145 ptr = XVECTOR (vector)->contents; | |
3146 for (i = 0; i < size; i++) | |
3147 { | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3148 item = Fcar (tem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3149 /* 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
|
3150 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
|
3151 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
|
3152 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
|
3153 if (bytecodeflag && load_force_doc_strings) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3154 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3155 if (i == COMPILED_BYTECODE) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3156 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3157 if (!STRINGP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3158 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3159 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3160 /* 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
|
3161 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
|
3162 constants slot is nil). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3163 ptr[COMPILED_CONSTANTS] = item; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3164 item = Qnil; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3165 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3166 else if (i == COMPILED_CONSTANTS) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3167 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3168 Lisp_Object bytestr = ptr[COMPILED_CONSTANTS]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3169 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3170 if (NILP (item)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3171 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3172 /* 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
|
3173 but without generating extra garbage and |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3174 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
|
3175 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
|
3176 STRING_SET_UNIBYTE (bytestr); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3177 |
88886 | 3178 item = Fread (Fcons (bytestr, readcharfun)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3179 if (!CONSP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3180 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3181 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3182 otem = XCONS (item); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3183 bytestr = XCAR (item); |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3184 item = XCDR (item); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3185 free_cons (otem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3186 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3187 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3188 /* Now handle the bytecode slot. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3189 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
|
3190 } |
88886 | 3191 else if (i == COMPILED_DOC_STRING |
3192 && STRINGP (item) | |
3193 && ! STRING_MULTIBYTE (item)) | |
3194 { | |
3195 if (EQ (readcharfun, Qget_emacs_mule_file_char)) | |
3196 item = Fdecode_coding_string (item, Qemacs_mule, Qnil, Qnil); | |
3197 else | |
3198 item = Fstring_as_multibyte (item); | |
3199 } | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3200 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3201 ptr[i] = read_pure ? Fpurecopy (item) : item; |
341 | 3202 otem = XCONS (tem); |
3203 tem = Fcdr (tem); | |
3204 free_cons (otem); | |
3205 } | |
3206 return vector; | |
3207 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3208 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
3209 /* 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
|
3210 FLAG = -1 means check for starting with defun |
341 | 3211 and make structure pure. */ |
3212 | |
3213 static Lisp_Object | |
3214 read_list (flag, readcharfun) | |
3215 int flag; | |
3216 register Lisp_Object readcharfun; | |
3217 { | |
3218 /* -1 means check next element for defun, | |
3219 0 means don't check, | |
3220 1 means already checked and found defun. */ | |
3221 int defunflag = flag < 0 ? -1 : 0; | |
3222 Lisp_Object val, tail; | |
3223 register Lisp_Object elt, tem; | |
3224 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
|
3225 /* 0 is the normal case. |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3226 1 means this list is a doc reference; replace it with the number 0. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3227 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
|
3228 int doc_reference = 0; |
341 | 3229 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3230 /* 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
|
3231 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
|
3232 |
341 | 3233 val = Qnil; |
3234 tail = Qnil; | |
3235 | |
3236 while (1) | |
3237 { | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3238 int ch; |
341 | 3239 GCPRO2 (val, tail); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3240 elt = read1 (readcharfun, &ch, first_in_list); |
341 | 3241 UNGCPRO; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3242 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3243 first_in_list = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3244 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3245 /* 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
|
3246 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
|
3247 && ! 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
|
3248 && !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
|
3249 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3250 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
|
3251 /* 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
|
3252 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
|
3253 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
|
3254 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
|
3255 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
|
3256 else |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3257 /* 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
|
3258 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
|
3259 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
|
3260 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
|
3261 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
|
3262 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
|
3263 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
|
3264 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3265 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
|
3266 && ! NILP (elt) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3267 && load_force_doc_strings) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3268 doc_reference = 2; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3269 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3270 if (ch) |
341 | 3271 { |
3272 if (flag > 0) | |
3273 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3274 if (ch == ']') |
341 | 3275 return val; |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3276 invalid_syntax (") or . in a vector", 18); |
341 | 3277 } |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3278 if (ch == ')') |
341 | 3279 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
|
3280 if (ch == '.') |
341 | 3281 { |
3282 GCPRO2 (val, tail); | |
485 | 3283 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3284 XSETCDR (tail, read0 (readcharfun)); |
341 | 3285 else |
3286 val = read0 (readcharfun); | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3287 read1 (readcharfun, &ch, 0); |
341 | 3288 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
|
3289 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
|
3290 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3291 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
|
3292 return make_number (0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3293 if (doc_reference == 2) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3294 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3295 /* Get a doc string from the file we are loading. |
88886 | 3296 If it's in saved_doc_string, get it from there. |
3297 | |
3298 Here, we don't know if the string is a | |
3299 bytecode string or a doc string. As a | |
3300 bytecode string must be unibyte, we always | |
3301 return a unibyte string. If it is actually a | |
3302 doc string, caller must make it | |
3303 multibyte. */ | |
89483 | 3304 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3305 int pos = XINT (XCDR (val)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3306 /* Position is negative for user variables. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3307 if (pos < 0) pos = -pos; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3308 if (pos >= saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3309 && pos < (saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3310 + saved_doc_string_length)) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3311 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3312 int start = pos - saved_doc_string_position; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3313 int from, to; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3314 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3315 /* Process quoting with ^A, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3316 and find the end of the string, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3317 which is marked with ^_ (037). */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3318 for (from = start, to = start; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3319 saved_doc_string[from] != 037;) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3320 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3321 int c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3322 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3323 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3324 c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3325 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3326 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3327 else if (c == '0') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3328 saved_doc_string[to++] = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3329 else if (c == '_') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3330 saved_doc_string[to++] = 037; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3331 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3332 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3333 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3334 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3335 |
88886 | 3336 return make_unibyte_string (saved_doc_string + start, |
3337 to - start); | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3338 } |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3339 /* 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
|
3340 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
|
3341 && pos < (prev_saved_doc_string_position |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3342 + prev_saved_doc_string_length)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3343 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3344 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
|
3345 int from, to; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3346 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3347 /* Process quoting with ^A, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3348 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
|
3349 which is marked with ^_ (037). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3350 for (from = start, to = start; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3351 prev_saved_doc_string[from] != 037;) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3352 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3353 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
|
3354 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3355 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3356 c = prev_saved_doc_string[from++]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3357 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3358 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3359 else if (c == '0') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3360 prev_saved_doc_string[to++] = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3361 else if (c == '_') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3362 prev_saved_doc_string[to++] = 037; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3363 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3364 else |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3365 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3366 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3367 |
88886 | 3368 return make_unibyte_string (prev_saved_doc_string |
3369 + start, | |
3370 to - start); | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3371 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3372 else |
88886 | 3373 return get_doc_string (val, 1, 0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3374 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3375 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3376 return val; |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3377 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3378 invalid_syntax (". in wrong context", 18); |
341 | 3379 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3380 invalid_syntax ("] in a list", 11); |
341 | 3381 } |
3382 tem = (read_pure && flag <= 0 | |
3383 ? pure_cons (elt, Qnil) | |
3384 : Fcons (elt, Qnil)); | |
485 | 3385 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3386 XSETCDR (tail, tem); |
341 | 3387 else |
3388 val = tem; | |
3389 tail = tem; | |
3390 if (defunflag < 0) | |
3391 defunflag = EQ (elt, Qdefun); | |
3392 else if (defunflag > 0) | |
3393 read_pure = 1; | |
3394 } | |
3395 } | |
3396 | |
3397 Lisp_Object Vobarray; | |
3398 Lisp_Object initial_obarray; | |
3399 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3400 /* 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
|
3401 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3402 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
|
3403 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3404 static int hash_string (); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3405 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3406 /* 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
|
3407 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
|
3408 |
341 | 3409 Lisp_Object |
3410 check_obarray (obarray) | |
3411 Lisp_Object obarray; | |
3412 { | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
3413 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3414 { |
3415 /* If Vobarray is now invalid, force it to be valid. */ | |
3416 if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
3417 wrong_type_argument (Qvectorp, obarray); |
341 | 3418 } |
3419 return obarray; | |
3420 } | |
3421 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3422 /* 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
|
3423 interned in the current obarray. */ |
341 | 3424 |
3425 Lisp_Object | |
3426 intern (str) | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3427 const char *str; |
341 | 3428 { |
3429 Lisp_Object tem; | |
3430 int len = strlen (str); | |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3431 Lisp_Object obarray; |
341 | 3432 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3433 obarray = Vobarray; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3434 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3435 obarray = check_obarray (obarray); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3436 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
|
3437 if (SYMBOLP (tem)) |
341 | 3438 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
|
3439 return Fintern (make_string (str, len), obarray); |
341 | 3440 } |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3441 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3442 /* 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
|
3443 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3444 Lisp_Object |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3445 make_symbol (str) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3446 char *str; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3447 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3448 int len = strlen (str); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3449 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3450 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
|
3451 ? 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
|
3452 : make_string (str, len))); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3453 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3454 |
341 | 3455 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
|
3456 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
|
3457 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
|
3458 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
|
3459 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
|
3460 (string, obarray) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3461 Lisp_Object string, obarray; |
341 | 3462 { |
3463 register Lisp_Object tem, sym, *ptr; | |
3464 | |
485 | 3465 if (NILP (obarray)) obarray = Vobarray; |
341 | 3466 obarray = check_obarray (obarray); |
3467 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3468 CHECK_STRING (string); |
341 | 3469 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3470 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
|
3471 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3472 SBYTES (string)); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3473 if (!INTEGERP (tem)) |
341 | 3474 return tem; |
3475 | |
485 | 3476 if (!NILP (Vpurify_flag)) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3477 string = Fpurecopy (string); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3478 sym = Fmake_symbol (string); |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3479 |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3480 if (EQ (obarray, initial_obarray)) |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3481 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
|
3482 else |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3483 XSYMBOL (sym)->interned = SYMBOL_INTERNED; |
341 | 3484 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3485 if ((SREF (string, 0) == ':') |
21982
456f95c03285
(Fintern): Properly compare lisp objects.
Richard M. Stallman <rms@gnu.org>
parents:
21936
diff
changeset
|
3486 && EQ (obarray, initial_obarray)) |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3487 { |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3488 XSYMBOL (sym)->constant = 1; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3489 XSYMBOL (sym)->value = sym; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3490 } |
17918
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
3491 |
341 | 3492 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
|
3493 if (SYMBOLP (*ptr)) |
341 | 3494 XSYMBOL (sym)->next = XSYMBOL (*ptr); |
3495 else | |
3496 XSYMBOL (sym)->next = 0; | |
3497 *ptr = sym; | |
3498 return sym; | |
3499 } | |
3500 | |
3501 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
|
3502 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
|
3503 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
|
3504 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
|
3505 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
|
3506 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
|
3507 (name, obarray) |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3508 Lisp_Object name, obarray; |
341 | 3509 { |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3510 register Lisp_Object tem, string; |
341 | 3511 |
485 | 3512 if (NILP (obarray)) obarray = Vobarray; |
341 | 3513 obarray = check_obarray (obarray); |
3514 | |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3515 if (!SYMBOLP (name)) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3516 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3517 CHECK_STRING (name); |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3518 string = name; |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3519 } |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3520 else |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3521 string = SYMBOL_NAME (name); |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3522 |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3523 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
|
3524 if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem))) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3525 return Qnil; |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3526 else |
341 | 3527 return tem; |
3528 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3529 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3530 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
|
3531 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
|
3532 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
|
3533 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
|
3534 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
|
3535 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
|
3536 (name, obarray) |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3537 Lisp_Object name, obarray; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3538 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3539 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
|
3540 int hash; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3541 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3542 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
|
3543 obarray = check_obarray (obarray); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3544 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3545 if (SYMBOLP (name)) |
45406
6f19e244af49
* lread.c (Fintern_soft, oblookup): Use SYMBOL_NAME and XSTRING
Ken Raeburn <raeburn@raeburn.org>
parents:
45001
diff
changeset
|
3546 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
|
3547 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3548 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3549 CHECK_STRING (name); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3550 string = name; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3551 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3552 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3553 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
|
3554 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3555 SBYTES (string)); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3556 if (INTEGERP (tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3557 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3558 /* 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
|
3559 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
|
3560 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3561 |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3562 XSYMBOL (tem)->interned = SYMBOL_UNINTERNED; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3563 XSYMBOL (tem)->constant = 0; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3564 XSYMBOL (tem)->indirect_variable = 0; |
20773
6c655dc99321
(Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
3565 |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3566 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
|
3567 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3568 if (EQ (XVECTOR (obarray)->contents[hash], tem)) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3569 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3570 if (XSYMBOL (tem)->next) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3571 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3572 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3573 XSETINT (XVECTOR (obarray)->contents[hash], 0); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3574 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3575 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3576 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3577 Lisp_Object tail, following; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3578 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3579 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
|
3580 XSYMBOL (tail)->next; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3581 tail = following) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3582 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3583 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
|
3584 if (EQ (following, tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3585 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3586 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
|
3587 break; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3588 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3589 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3590 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3591 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3592 return Qt; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3593 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3594 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3595 /* 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
|
3596 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
|
3597 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
|
3598 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3599 Also store the bucket number in oblookup_last_bucket_number. */ |
341 | 3600 |
3601 Lisp_Object | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3602 oblookup (obarray, ptr, size, size_byte) |
341 | 3603 Lisp_Object obarray; |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3604 register const char *ptr; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3605 int size, size_byte; |
341 | 3606 { |
8828 | 3607 int hash; |
3608 int obsize; | |
341 | 3609 register Lisp_Object tail; |
3610 Lisp_Object bucket, tem; | |
3611 | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3612 if (!VECTORP (obarray) |
5243 | 3613 || (obsize = XVECTOR (obarray)->size) == 0) |
341 | 3614 { |
3615 obarray = check_obarray (obarray); | |
3616 obsize = XVECTOR (obarray)->size; | |
3617 } | |
13455
4f5a9ce67782
(oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
3618 /* 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
|
3619 obsize &= ~ARRAY_MARK_FLAG; |
341 | 3620 /* 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
|
3621 hash = hash_string (ptr, size_byte); |
341 | 3622 hash %= obsize; |
3623 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
|
3624 oblookup_last_bucket_number = hash; |
58449
377948a6af9a
(oblookup): Don't use XFASTINT blindly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58093
diff
changeset
|
3625 if (EQ (bucket, make_number (0))) |
341 | 3626 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3627 else if (!SYMBOLP (bucket)) |
341 | 3628 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
|
3629 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3630 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next)) |
341 | 3631 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3632 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
|
3633 && 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
|
3634 && !bcmp (SDATA (SYMBOL_NAME (tail)), ptr, size_byte)) |
341 | 3635 return tail; |
3636 else if (XSYMBOL (tail)->next == 0) | |
3637 break; | |
3638 } | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3639 XSETINT (tem, hash); |
341 | 3640 return tem; |
3641 } | |
3642 | |
3643 static int | |
3644 hash_string (ptr, len) | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3645 const unsigned char *ptr; |
341 | 3646 int len; |
3647 { | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3648 register const unsigned char *p = ptr; |
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3649 register const unsigned char *end = p + len; |
341 | 3650 register unsigned char c; |
3651 register int hash = 0; | |
3652 | |
3653 while (p != end) | |
3654 { | |
3655 c = *p++; | |
3656 if (c >= 0140) c -= 40; | |
3657 hash = ((hash<<3) + (hash>>28) + c); | |
3658 } | |
3659 return hash & 07777777777; | |
3660 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3661 |
341 | 3662 void |
3663 map_obarray (obarray, fn, arg) | |
3664 Lisp_Object obarray; | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3665 void (*fn) P_ ((Lisp_Object, Lisp_Object)); |
341 | 3666 Lisp_Object arg; |
3667 { | |
3668 register int i; | |
3669 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
|
3670 CHECK_VECTOR (obarray); |
341 | 3671 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--) |
3672 { | |
3673 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
|
3674 if (SYMBOLP (tail)) |
341 | 3675 while (1) |
3676 { | |
3677 (*fn) (tail, arg); | |
3678 if (XSYMBOL (tail)->next == 0) | |
3679 break; | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3680 XSETSYMBOL (tail, XSYMBOL (tail)->next); |
341 | 3681 } |
3682 } | |
3683 } | |
3684 | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3685 void |
341 | 3686 mapatoms_1 (sym, function) |
3687 Lisp_Object sym, function; | |
3688 { | |
3689 call1 (function, sym); | |
3690 } | |
3691 | |
3692 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
|
3693 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
|
3694 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
|
3695 (function, obarray) |
341 | 3696 Lisp_Object function, obarray; |
3697 { | |
485 | 3698 if (NILP (obarray)) obarray = Vobarray; |
341 | 3699 obarray = check_obarray (obarray); |
3700 | |
3701 map_obarray (obarray, mapatoms_1, function); | |
3702 return Qnil; | |
3703 } | |
3704 | |
5117
951396781a0e
(OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents:
5017
diff
changeset
|
3705 #define OBARRAY_SIZE 1511 |
341 | 3706 |
3707 void | |
3708 init_obarray () | |
3709 { | |
3710 Lisp_Object oblength; | |
3711 int hash; | |
3712 Lisp_Object *tem; | |
3713 | |
9313
ed68c3822e4b
(read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9274
diff
changeset
|
3714 XSETFASTINT (oblength, OBARRAY_SIZE); |
341 | 3715 |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3716 Qnil = Fmake_symbol (make_pure_string ("nil", 3, 3, 0)); |
341 | 3717 Vobarray = Fmake_vector (oblength, make_number (0)); |
3718 initial_obarray = Vobarray; | |
3719 staticpro (&initial_obarray); | |
3720 /* Intern nil in the obarray */ | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3721 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
|
3722 XSYMBOL (Qnil)->constant = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3723 |
341 | 3724 /* These locals are to kludge around a pyramid compiler bug. */ |
3725 hash = hash_string ("nil", 3); | |
3726 /* Separate statement here to avoid VAXC bug. */ | |
3727 hash %= OBARRAY_SIZE; | |
3728 tem = &XVECTOR (Vobarray)->contents[hash]; | |
3729 *tem = Qnil; | |
3730 | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3731 Qunbound = Fmake_symbol (make_pure_string ("unbound", 7, 7, 0)); |
341 | 3732 XSYMBOL (Qnil)->function = Qunbound; |
3733 XSYMBOL (Qunbound)->value = Qunbound; | |
3734 XSYMBOL (Qunbound)->function = Qunbound; | |
3735 | |
3736 Qt = intern ("t"); | |
3737 XSYMBOL (Qnil)->value = Qnil; | |
3738 XSYMBOL (Qnil)->plist = Qnil; | |
3739 XSYMBOL (Qt)->value = Qt; | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3740 XSYMBOL (Qt)->constant = 1; |
341 | 3741 |
3742 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */ | |
3743 Vpurify_flag = Qt; | |
3744 | |
3745 Qvariable_documentation = intern ("variable-documentation"); | |
16228
fa7a56c543df
(init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents:
16165
diff
changeset
|
3746 staticpro (&Qvariable_documentation); |
341 | 3747 |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
3748 read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH; |
27852
98f55bbdbbad
(Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents:
27763
diff
changeset
|
3749 read_buffer = (char *) xmalloc (read_buffer_size); |
341 | 3750 } |
3751 | |
3752 void | |
3753 defsubr (sname) | |
3754 struct Lisp_Subr *sname; | |
3755 { | |
3756 Lisp_Object sym; | |
3757 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
|
3758 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3759 } |
3760 | |
3761 #ifdef NOTDEF /* use fset in subr.el now */ | |
3762 void | |
3763 defalias (sname, string) | |
3764 struct Lisp_Subr *sname; | |
3765 char *string; | |
3766 { | |
3767 Lisp_Object sym; | |
3768 sym = intern (string); | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3769 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3770 } |
3771 #endif /* NOTDEF */ | |
3772 | |
3773 /* 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
|
3774 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
|
3775 /* DEFVAR_INT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */ |
341 | 3776 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3777 defvar_int (namestring, address) |
341 | 3778 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
|
3779 EMACS_INT *address; |
341 | 3780 { |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3781 Lisp_Object sym, val; |
341 | 3782 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
|
3783 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3784 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
|
3785 XINTFWD (val)->intvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3786 SET_SYMBOL_VALUE (sym, val); |
341 | 3787 } |
3788 | |
42206 | 3789 /* Similar but define a variable whose value is t if address contains 1, |
3790 nil if address contains 0 */ | |
341 | 3791 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3792 defvar_bool (namestring, address) |
341 | 3793 char *namestring; |
3794 int *address; | |
3795 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3796 Lisp_Object sym, val; |
341 | 3797 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
|
3798 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3799 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
|
3800 XBOOLFWD (val)->boolvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3801 SET_SYMBOL_VALUE (sym, val); |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
3802 Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars); |
341 | 3803 } |
3804 | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3805 /* 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
|
3806 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
|
3807 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
|
3808 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
|
3809 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
|
3810 void |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3811 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
|
3812 char *namestring; |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3813 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
|
3814 { |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3815 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
|
3816 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
|
3817 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3818 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
|
3819 XOBJFWD (val)->objvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3820 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
|
3821 } |
341 | 3822 |
3823 void | |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3824 defvar_lisp (namestring, address) |
341 | 3825 char *namestring; |
3826 Lisp_Object *address; | |
3827 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3828 defvar_lisp_nopro (namestring, address); |
341 | 3829 staticpro (address); |
3830 } | |
3831 | |
3832 /* 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
|
3833 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
|
3834 that is current now. */ |
341 | 3835 |
3836 void | |
1009
bf78b5ea9b3a
* lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents:
851
diff
changeset
|
3837 defvar_per_buffer (namestring, address, type, doc) |
341 | 3838 char *namestring; |
3839 Lisp_Object *address; | |
1009
bf78b5ea9b3a
* lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents:
851
diff
changeset
|
3840 Lisp_Object type; |
341 | 3841 char *doc; |
3842 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3843 Lisp_Object sym, val; |
341 | 3844 int offset; |
3845 | |
3846 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
|
3847 val = allocate_misc (); |
341 | 3848 offset = (char *)address - (char *)current_buffer; |
3849 | |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3850 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
|
3851 XBUFFER_OBJFWD (val)->offset = offset; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3852 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
|
3853 PER_BUFFER_SYMBOL (offset) = sym; |
27133646d187
Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents:
28318
diff
changeset
|
3854 PER_BUFFER_TYPE (offset) = type; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3855 |
28367
27133646d187
Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents:
28318
diff
changeset
|
3856 if (PER_BUFFER_IDX (offset) == 0) |
341 | 3857 /* Did a DEFVAR_PER_BUFFER without initializing the corresponding |
3858 slot of buffer_local_flags */ | |
3859 abort (); | |
3860 } | |
3861 | |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3862 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3863 /* 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
|
3864 at a particular offset in the current kboard object. */ |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3865 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3866 void |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
3867 defvar_kboard (namestring, offset) |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3868 char *namestring; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3869 int offset; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3870 { |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3871 Lisp_Object sym, val; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3872 sym = intern (namestring); |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3873 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3874 XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd; |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
3875 XKBOARD_OBJFWD (val)->offset = offset; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3876 SET_SYMBOL_VALUE (sym, val); |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3877 } |
341 | 3878 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3879 /* 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
|
3880 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
|
3881 static Lisp_Object dump_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3882 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3883 void |
364 | 3884 init_lread () |
341 | 3885 { |
617 | 3886 char *normal; |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3887 int turn_off_warning = 0; |
341 | 3888 |
364 | 3889 /* Compute the default load-path. */ |
617 | 3890 #ifdef CANNOT_DUMP |
3891 normal = PATH_LOADSEARCH; | |
638 | 3892 Vload_path = decode_env_path (0, normal); |
617 | 3893 #else |
3894 if (NILP (Vpurify_flag)) | |
3895 normal = PATH_LOADSEARCH; | |
3896 else | |
3897 normal = PATH_DUMPLOADSEARCH; | |
3898 | |
3899 /* In a dumped Emacs, we normally have to reset the value of | |
3900 Vload_path from PATH_LOADSEARCH, since the value that was dumped | |
3901 uses ../lisp, instead of the path of the installed elisp | |
3902 libraries. However, if it appears that Vload_path was changed | |
3903 from the default before dumping, don't override that value. */ | |
621 | 3904 if (initialized) |
3905 { | |
3906 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
|
3907 { |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3908 Vload_path = decode_env_path (0, normal); |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3909 if (!NILP (Vinstallation_directory)) |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3910 { |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3911 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
|
3912 |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3913 /* 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
|
3914 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
|
3915 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
|
3916 sitelisp = Qnil; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3917 while (1) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3918 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3919 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
|
3920 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
|
3921 tem, Qnil); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3922 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
|
3923 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3924 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
|
3925 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
|
3926 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3927 else |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3928 break; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3929 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3930 |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3931 /* 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
|
3932 installation dir, if it exists. */ |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3933 tem = Fexpand_file_name (build_string ("lisp"), |
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3934 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
|
3935 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
|
3936 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
|
3937 { |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3938 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
|
3939 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3940 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
|
3941 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
|
3942 } |
7004
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3943 } |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3944 else |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3945 /* 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
|
3946 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
|
3947 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
|
3948 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3949 /* 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
|
3950 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
|
3951 Vinstallation_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3952 tem1 = Ffile_exists_p (tem); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3953 if (!NILP (tem1)) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3954 { |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3955 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
|
3956 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
|
3957 } |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3958 |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3959 /* 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
|
3960 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
|
3961 Vinstallation_directory); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3962 tem1 = Ffile_exists_p (tem); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3963 if (!NILP (tem1)) |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3964 { |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3965 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
|
3966 Vload_path = Fcons (tem, Vload_path); |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3967 } |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3968 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3969 /* 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
|
3970 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
|
3971 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
|
3972 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3973 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
|
3974 { |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3975 Lisp_Object tem2; |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3976 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3977 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
|
3978 Vinstallation_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3979 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
|
3980 |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3981 /* 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
|
3982 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
|
3983 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
|
3984 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
|
3985 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
|
3986 Vinstallation_directory); |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3987 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
|
3988 if (!NILP (tem1) && NILP (tem2)) |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3989 { |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3990 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
|
3991 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3992 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3993 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
|
3994 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
|
3995 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3996 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
|
3997 Vsource_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3998 |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3999 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
|
4000 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
|
4001 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4002 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
|
4003 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4004 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4005 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
|
4006 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
|
4007 } |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4008 } |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4009 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
|
4010 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
|
4011 } |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
4012 } |
621 | 4013 } |
4014 else | |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4015 { |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
4016 /* 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
|
4017 /* 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
|
4018 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
|
4019 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
|
4020 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
|
4021 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
|
4022 dump_path = Vload_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4023 } |
364 | 4024 #endif |
4025 | |
55150
f78c7b75f616
lread.c (init_lread): Fixing typo HAVE_CARBON test logic
Steven Tamm <steventamm@mac.com>
parents:
55139
diff
changeset
|
4026 #if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON)))) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4027 /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4028 almost never correct, thereby causing a warning to be printed out that |
14036 | 4029 confuses users. Since PATH_LOADSEARCH is always overridden by the |
58093
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
4030 EMACSLOADPATH environment variable below, disable the warning on NT. |
55139
2b5be9da52c2
lread.c (init_lread): Don't display missing lisp directory
Steven Tamm <steventamm@mac.com>
parents:
53581
diff
changeset
|
4031 Also, when using the "self-contained" option for Carbon Emacs for MacOSX, |
2b5be9da52c2
lread.c (init_lread): Don't display missing lisp directory
Steven Tamm <steventamm@mac.com>
parents:
53581
diff
changeset
|
4032 the "standard" paths may not exist and would be overridden by |
2b5be9da52c2
lread.c (init_lread): Don't display missing lisp directory
Steven Tamm <steventamm@mac.com>
parents:
53581
diff
changeset
|
4033 EMACSLOADPATH as on NT. Since this depends on how the executable |
2b5be9da52c2
lread.c (init_lread): Don't display missing lisp directory
Steven Tamm <steventamm@mac.com>
parents:
53581
diff
changeset
|
4034 was build and packaged, turn off the warnings in general */ |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
4035 |
341 | 4036 /* 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
|
4037 if (!turn_off_warning) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4038 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4039 Lisp_Object path_tail; |
341 | 4040 |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4041 for (path_tail = Vload_path; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4042 !NILP (path_tail); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
4043 path_tail = XCDR (path_tail)) |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4044 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4045 Lisp_Object dirfile; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4046 dirfile = Fcar (path_tail); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4047 if (STRINGP (dirfile)) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4048 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4049 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
|
4050 if (access (SDATA (dirfile), 0) < 0) |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4051 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
|
4052 XCAR (path_tail)); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4053 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4054 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4055 } |
55150
f78c7b75f616
lread.c (init_lread): Fixing typo HAVE_CARBON test logic
Steven Tamm <steventamm@mac.com>
parents:
55139
diff
changeset
|
4056 #endif /* !(WINDOWSNT || HAVE_CARBON) */ |
617 | 4057 |
4058 /* If the EMACSLOADPATH environment variable is set, use its value. | |
4059 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
|
4060 #ifndef CANNOT_DUMP |
617 | 4061 if (NILP (Vpurify_flag) |
4062 && egetenv ("EMACSLOADPATH")) | |
11955
d972c95e7577
(init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11868
diff
changeset
|
4063 #endif |
364 | 4064 Vload_path = decode_env_path ("EMACSLOADPATH", normal); |
4065 | |
4066 Vvalues = Qnil; | |
4067 | |
341 | 4068 load_in_progress = 0; |
15283
b2be450a8da4
(init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
15091
diff
changeset
|
4069 Vload_file_name = Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4070 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4071 load_descriptor_list = Qnil; |
21291
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4072 |
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4073 Vstandard_input = Qt; |
31536
76cf765a7dad
(init_lread): Set Vloads_in_progress to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
31534
diff
changeset
|
4074 Vloads_in_progress = Qnil; |
341 | 4075 } |
4076 | |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4077 /* 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
|
4078 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
|
4079 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
4080 void |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4081 dir_warning (format, dirname) |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4082 char *format; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4083 Lisp_Object dirname; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4084 { |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4085 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
|
4086 = (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
|
4087 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4088 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
|
4089 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
|
4090 /* 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
|
4091 if (initialized) |
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
4092 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
|
4093 } |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4094 |
341 | 4095 void |
364 | 4096 syms_of_lread () |
341 | 4097 { |
4098 defsubr (&Sread); | |
4099 defsubr (&Sread_from_string); | |
4100 defsubr (&Sintern); | |
4101 defsubr (&Sintern_soft); | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
4102 defsubr (&Sunintern); |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4103 defsubr (&Sget_load_suffixes); |
341 | 4104 defsubr (&Sload); |
672 | 4105 defsubr (&Seval_buffer); |
341 | 4106 defsubr (&Seval_region); |
4107 defsubr (&Sread_char); | |
4108 defsubr (&Sread_char_exclusive); | |
4109 defsubr (&Sread_event); | |
4110 defsubr (&Sget_file_char); | |
4111 defsubr (&Smapatoms); | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
4112 defsubr (&Slocate_file_internal); |
341 | 4113 |
4114 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
|
4115 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
|
4116 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
|
4117 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
|
4118 to find all the symbols in an obarray, use `mapatoms'. */); |
341 | 4119 |
4120 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
|
4121 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
|
4122 Order is reverse chronological. */); |
341 | 4123 |
4124 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
|
4125 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
|
4126 See documentation of `read' for possible values. */); |
341 | 4127 Vstandard_input = Qt; |
4128 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4129 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
|
4130 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
|
4131 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4132 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
|
4133 will be added to `read-symbol-positions-list'. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4134 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
|
4135 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
|
4136 defined, although they may be in the future. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4137 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4138 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
|
4139 `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
|
4140 the toplevel; bind it instead. */); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4141 Vread_with_symbol_positions = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4142 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4143 DEFVAR_LISP ("read-symbol-positions-list", &Vread_symbol_positions_list, |
47919
b85eeb858fb1
(syms_of_lread): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
47847
diff
changeset
|
4144 doc: /* A list mapping read symbols to their positions. |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4145 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
|
4146 `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
|
4147 non-nil. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4148 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4149 Each element of the list looks like (SYMBOL . CHAR-POSITION), where |
47919
b85eeb858fb1
(syms_of_lread): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
47847
diff
changeset
|
4150 CHAR-POSITION is an integer giving the offset of that occurrence of the |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4151 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
|
4152 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4153 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
|
4154 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
|
4155 were read in. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4156 Vread_symbol_positions_list = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4157 |
341 | 4158 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
|
4159 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
|
4160 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
|
4161 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
|
4162 otherwise to default specified by file `epaths.h' when Emacs was built. */); |
341 | 4163 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4164 DEFVAR_LISP ("load-suffixes", &Vload_suffixes, |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4165 doc: /* List of suffixes for (compiled or source) Emacs Lisp files. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4166 This list should not include the empty string. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4167 `load' and related functions try to append these suffixes, in order, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4168 to the specified file name if a Lisp suffix is allowed or required. */); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4169 Vload_suffixes = Fcons (build_string (".elc"), |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4170 Fcons (build_string (".el"), Qnil)); |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4171 DEFVAR_LISP ("load-file-rep-suffixes", &Vload_file_rep_suffixes, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4172 doc: /* List of suffixes that indicate representations of \ |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4173 the same file. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4174 This list should normally start with the empty string. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4175 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4176 Enabling Auto Compression mode appends the suffixes in |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4177 `jka-compr-load-suffixes' to this list and disabling Auto Compression |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4178 mode removes them again. `load' and related functions use this list to |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4179 determine whether they should look for compressed versions of a file |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4180 and, if so, which suffixes they should try to append to the file name |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4181 in order to do so. However, if you want to customize which suffixes |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4182 the loading functions recognize as compression suffixes, you should |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4183 customize `jka-compr-load-suffixes' rather than the present variable. */); |
39809
57070445ceac
(syms_of_lread): Fix init of default_suffixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39808
diff
changeset
|
4184 /* We don't use empty_string because it's not initialized yet. */ |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4185 Vload_file_rep_suffixes = Fcons (build_string (""), Qnil); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4186 |
341 | 4187 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
|
4188 doc: /* Non-nil iff inside of `load'. */); |
341 | 4189 |
4190 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
|
4191 doc: /* An alist of expressions to be evalled when particular files are loaded. |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4192 Each element looks like (REGEXP-OR-FEATURE FORMS...). |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4193 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4194 REGEXP-OR-FEATURE is either a regular expression to match file names, or |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4195 a symbol \(a feature name). |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4196 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4197 When `load' is run and the file-name argument matches an element's |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4198 REGEXP-OR-FEATURE, or when `provide' is run and provides the symbol |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4199 REGEXP-OR-FEATURE, the FORMS in the element are executed. |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4200 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4201 An error in FORMS does not undo the load, but does prevent execution of |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4202 the rest of the FORMS. */); |
341 | 4203 Vafter_load_alist = Qnil; |
4204 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
4205 DEFVAR_LISP ("load-history", &Vload_history, |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
4206 doc: /* Alist mapping file names to symbols and features. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4207 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
|
4208 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
|
4209 definitions evaluated from buffers not visiting files. |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4210 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4211 The file name is absolute and is the true file name (i.e. it doesn't |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4212 contain symbolic links) of the loaded file. |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4213 |
59108
f83ca2ccbeeb
(syms_of_lread) <load-history>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58517
diff
changeset
|
4214 The remaining elements of each list are symbols defined as variables |
47021
3bd4234e0844
(build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents:
46472
diff
changeset
|
4215 and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)', |
59108
f83ca2ccbeeb
(syms_of_lread) <load-history>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58517
diff
changeset
|
4216 `(defun . FUNCTION)', `(autoload . SYMBOL)', and `(t . SYMBOL)'. |
f83ca2ccbeeb
(syms_of_lread) <load-history>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58517
diff
changeset
|
4217 An element `(t . SYMBOL)' precedes an entry `(defun . FUNCTION)', |
48726
8e3eb5de7b47
(syms_of_lread) <load-history>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
48149
diff
changeset
|
4218 and means that SYMBOL was an autoload before this file redefined it |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
4219 as a function. |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
4220 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
4221 During preloading, the file name recorded is relative to the main Lisp |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
4222 directory. These file names are converted to absolute at startup. */); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
4223 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
|
4224 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4225 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
|
4226 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
|
4227 Vload_file_name = Qnil; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4228 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4229 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
|
4230 doc: /* File name, including directory, of user's initialization file. |
60069
edecd7c1824e
(syms_of_lread) <user-init-file>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59108
diff
changeset
|
4231 If the file loaded had extension `.elc', and the corresponding source file |
edecd7c1824e
(syms_of_lread) <user-init-file>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59108
diff
changeset
|
4232 exists, this variable contains the name of source file, suitable for use |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4233 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
|
4234 Vuser_init_file = Qnil; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4235 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
4236 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
|
4237 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
|
4238 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
|
4239 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4240 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
|
4241 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
|
4242 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
|
4243 Vload_read_function = Qnil; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4244 |
17038 | 4245 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
|
4246 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
|
4247 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
|
4248 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
|
4249 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
|
4250 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
|
4251 See `load' for the meaning of the remaining arguments. */); |
17038 | 4252 Vload_source_file_function = Qnil; |
4253 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4254 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
|
4255 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
|
4256 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
|
4257 load_force_doc_strings = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4258 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4259 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
|
4260 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
|
4261 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
|
4262 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
|
4263 load_convert_to_unibyte = 0; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4264 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
4265 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
|
4266 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
|
4267 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
|
4268 Vsource_directory |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4269 = Fexpand_file_name (build_string ("../"), |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4270 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH))); |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4271 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4272 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
|
4273 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
|
4274 Vpreloaded_file_list = Qnil; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4275 |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4276 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
|
4277 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
|
4278 Vbyte_boolean_vars = Qnil; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4279 |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4280 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
|
4281 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
|
4282 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
|
4283 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
|
4284 them. */); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4285 load_dangerous_libraries = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4286 |
31367
22eb2b661cdf
(syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents:
31315
diff
changeset
|
4287 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
|
4288 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
|
4289 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
|
4290 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
|
4291 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
|
4292 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
|
4293 Vbytecomp_version_regexp |
31464
2efc0e152012
(syms_of_lread): Change value of regexp
Gerd Moellmann <gerd@gnu.org>
parents:
31367
diff
changeset
|
4294 = build_string ("^;;;.\\(in Emacs version\\|bytecomp version FSF\\)"); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4295 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4296 DEFVAR_LISP ("eval-buffer-list", &Veval_buffer_list, |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4297 doc: /* List of buffers being read from by calls to `eval-buffer' and `eval-region'. */); |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4298 Veval_buffer_list = Qnil; |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4299 |
14300
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4300 /* Vsource_directory was initialized in init_lread. */ |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4301 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4302 load_descriptor_list = Qnil; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4303 staticpro (&load_descriptor_list); |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4304 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
4305 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
|
4306 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
|
4307 |
341 | 4308 Qstandard_input = intern ("standard-input"); |
4309 staticpro (&Qstandard_input); | |
4310 | |
4311 Qread_char = intern ("read-char"); | |
4312 staticpro (&Qread_char); | |
4313 | |
4314 Qget_file_char = intern ("get-file-char"); | |
4315 staticpro (&Qget_file_char); | |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4316 |
88886 | 4317 Qget_emacs_mule_file_char = intern ("get-emacs-mule-file-char"); |
4318 staticpro (&Qget_emacs_mule_file_char); | |
4319 | |
4320 Qload_force_doc_strings = intern ("load-force-doc-strings"); | |
4321 staticpro (&Qload_force_doc_strings); | |
4322 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4323 Qbackquote = intern ("`"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4324 staticpro (&Qbackquote); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4325 Qcomma = intern (","); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4326 staticpro (&Qcomma); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4327 Qcomma_at = intern (",@"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4328 staticpro (&Qcomma_at); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4329 Qcomma_dot = intern (",."); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4330 staticpro (&Qcomma_dot); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4331 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
4332 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
|
4333 staticpro (&Qinhibit_file_name_operation); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
4334 |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4335 Qascii_character = intern ("ascii-character"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4336 staticpro (&Qascii_character); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4337 |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4338 Qfunction = intern ("function"); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4339 staticpro (&Qfunction); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4340 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4341 Qload = intern ("load"); |
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4342 staticpro (&Qload); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4343 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4344 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
|
4345 staticpro (&Qload_file_name); |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4346 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4347 Qeval_buffer_list = intern ("eval-buffer-list"); |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4348 staticpro (&Qeval_buffer_list); |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4349 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4350 Qfile_truename = intern ("file-truename"); |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4351 staticpro (&Qfile_truename) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4352 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4353 Qdo_after_load_evaluation = intern ("do-after-load-evaluation"); |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4354 staticpro (&Qdo_after_load_evaluation) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4355 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4356 staticpro (&dump_path); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4357 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4358 staticpro (&read_objects); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4359 read_objects = Qnil; |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
4360 staticpro (&seen_list); |
64317
f69dd5d2d72d
(syms_of_lread): Initialize seen_list.
Kim F. Storm <storm@cua.dk>
parents:
64205
diff
changeset
|
4361 seen_list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4362 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4363 Vloads_in_progress = Qnil; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4364 staticpro (&Vloads_in_progress); |
341 | 4365 } |
52401 | 4366 |
4367 /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d | |
4368 (do not change this comment) */ |