Mercurial > emacs
annotate src/lread.c @ 97144:3e9c34bd95b3
* os.texi: Fix previous change.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 31 Jul 2008 10:04:21 +0000 |
parents | c3512b2085a0 |
children | 9a4bddae759e |
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, |
79759 | 4 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
341 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
341 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
11 (at your option) any later version. |
341 | 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 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
341 | 20 |
21 | |
7898 | 22 #include <config.h> |
341 | 23 #include <stdio.h> |
24 #include <sys/types.h> | |
25 #include <sys/stat.h> | |
26 #include <sys/file.h> | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
27 #include <errno.h> |
83449
ff74a86c2b16
Overhaul and simplify single_kboard API. Allow calls to `recursive-edit' in process filters. Small fixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
28 #include <setjmp.h> |
341 | 29 #include "lisp.h" |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
30 #include "intervals.h" |
341 | 31 #include "buffer.h" |
88383 | 32 #include "character.h" |
17038 | 33 #include "charset.h" |
88886 | 34 #include "coding.h" |
24412
d11ac02f9d6a
Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents:
23933
diff
changeset
|
35 #include <epaths.h> |
341 | 36 #include "commands.h" |
1591
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
37 #include "keyboard.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
38 #include "frame.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" |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
41 #include "blockinput.h" |
341 | 42 |
14972
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
43 #ifdef MSDOS |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
44 #if __DJGPP__ < 2 |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
45 #include <unistd.h> /* to get X_OK */ |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
46 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
47 #include "msdos.h" |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
48 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
49 |
21799 | 50 #ifdef HAVE_UNISTD_H |
51 #include <unistd.h> | |
52 #endif | |
53 | |
341 | 54 #ifndef X_OK |
55 #define X_OK 01 | |
56 #endif | |
57 | |
58 #include <math.h> | |
59 | |
14950 | 60 #ifdef HAVE_SETLOCALE |
61 #include <locale.h> | |
62 #endif /* HAVE_SETLOCALE */ | |
63 | |
51398 | 64 #ifdef HAVE_FCNTL_H |
65 #include <fcntl.h> | |
66 #endif | |
8596 | 67 #ifndef O_RDONLY |
68 #define O_RDONLY 0 | |
69 #endif | |
70 | |
34428
b2ec0cbfd60a
(file_offset, file_tell): Depend on HAVE_FSEEKO, not
Gerd Moellmann <gerd@gnu.org>
parents:
34362
diff
changeset
|
71 #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
|
72 #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
|
73 #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
|
74 #else |
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 long |
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 ftell |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
77 #endif |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
78 |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
79 #ifndef USE_CRT_DLL |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
80 extern int errno; |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
81 #endif |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
82 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
83 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; |
341 | 84 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
|
85 Lisp_Object Qascii_character, Qload, Qload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
86 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
|
87 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
|
88 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
|
89 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
|
90 |
88886 | 91 /* Used instead of Qget_file_char while loading *.elc files compiled |
92 by Emacs 21 or older. */ | |
93 static Lisp_Object Qget_emacs_mule_file_char; | |
94 | |
95 static Lisp_Object Qload_force_doc_strings; | |
96 | |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
97 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
|
98 extern Lisp_Object Qfile_exists_p; |
341 | 99 |
78501 | 100 /* non-zero if inside `load' */ |
341 | 101 int load_in_progress; |
102 | |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
103 /* Directory in which the sources were found. */ |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
104 Lisp_Object Vsource_directory; |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
105 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
106 /* 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
|
107 Lisp_Object Vload_path, Vload_suffixes, Vload_file_rep_suffixes; |
341 | 108 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
109 /* File name of user's init file. */ |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
110 Lisp_Object Vuser_init_file; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
111 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
112 /* 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
|
113 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
|
114 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
|
115 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
116 /* 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
|
117 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
|
118 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
119 /* List of files that were preloaded. */ |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
120 Lisp_Object Vpreloaded_file_list; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
121 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
122 /* 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
|
123 Lisp_Object Vload_file_name; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
124 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
125 /* 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
|
126 Lisp_Object Vload_read_function; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
127 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
128 /* 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
|
129 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
|
130 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
|
131 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
|
132 Lisp_Object read_objects; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
133 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
134 /* 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
|
135 static int load_force_doc_strings; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
136 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
137 /* 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
|
138 static int load_convert_to_unibyte; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
139 |
88886 | 140 /* Nonzero means READCHAR should read bytes one by one (not character) |
141 when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char. | |
142 This is set to 1 by read1 temporarily while handling #@NUMBER. */ | |
143 static int load_each_byte; | |
144 | |
73800
4d1706442c96
(syms_of_lread): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
72132
diff
changeset
|
145 /* Function to use for loading an Emacs Lisp source file (not |
17038 | 146 compiled) instead of readevalloop. */ |
147 Lisp_Object Vload_source_file_function; | |
148 | |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
149 /* 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
|
150 Lisp_Object Vbyte_boolean_vars; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
151 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
152 /* 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
|
153 read. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
154 Lisp_Object Vread_with_symbol_positions; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
155 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
156 /* List of (SYMBOL . POSITION) accumulated so far. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
157 Lisp_Object Vread_symbol_positions_list; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
158 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
159 /* 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
|
160 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
|
161 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
162 /* File for get_file_char to read from. Use by load. */ |
341 | 163 static FILE *instream; |
164 | |
165 /* When nonzero, read conses in pure space */ | |
166 static int read_pure; | |
167 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
168 /* For use within read-from-string (this reader is non-reentrant!!) */ |
341 | 169 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
|
170 static int read_from_string_index_byte; |
341 | 171 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
|
172 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
173 /* 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
|
174 Fread_from_string. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
175 static int readchar_count; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
176 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
177 /* This contains the last string skipped with #@. */ |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
178 static char *saved_doc_string; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
179 /* Length of buffer allocated in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
180 static int saved_doc_string_size; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
181 /* Length of actual data in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
182 static int saved_doc_string_length; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
183 /* 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
|
184 static file_offset saved_doc_string_position; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
185 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
186 /* 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
|
187 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
|
188 is put in saved_doc_string. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
189 static char *prev_saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
190 /* 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
|
191 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
|
192 /* 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
|
193 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
|
194 /* 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
|
195 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
|
196 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
197 /* 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
|
198 with no surrounding parentheses. |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
199 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
|
200 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
|
201 static int new_backquote_flag; |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
202 static Lisp_Object Vold_style_backquotes, Qold_style_backquotes; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
203 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
204 /* 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
|
205 check for recursive loads. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
206 |
61623
eac490378ade
(Vloads_in_progress): Static.
Lute Kamstra <lute@gnu.org>
parents:
61418
diff
changeset
|
207 static Lisp_Object Vloads_in_progress; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
208 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
209 /* Non-zero means load dangerous compiled Lisp files. */ |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
210 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
211 int load_dangerous_libraries; |
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 /* 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
|
214 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
215 static Lisp_Object Vbytecomp_version_regexp; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
216 |
88886 | 217 static int read_emacs_mule_char P_ ((int, int (*) (int, Lisp_Object), |
218 Lisp_Object)); | |
219 | |
47847
dd601595b35d
Minor white space fix, just supplement the log for previous change:
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47839
diff
changeset
|
220 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
|
221 Lisp_Object (*) (), int, |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
222 Lisp_Object, Lisp_Object, |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
223 Lisp_Object, Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
224 static Lisp_Object load_unwind P_ ((Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
225 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
|
226 |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
227 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
|
228 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
|
229 |
341 | 230 |
88886 | 231 /* Functions that read one byte from the current source READCHARFUN |
232 or unreads one byte. If the integer argument C is -1, it returns | |
233 one read byte, or -1 when there's no more byte in the source. If C | |
234 is 0 or positive, it unreads C, and the return value is not | |
235 interesting. */ | |
236 | |
237 static int readbyte_for_lambda P_ ((int, Lisp_Object)); | |
238 static int readbyte_from_file P_ ((int, Lisp_Object)); | |
239 static int readbyte_from_string P_ ((int, Lisp_Object)); | |
240 | |
341 | 241 /* Handle unreading and rereading of characters. |
242 Write READCHAR to read a character, | |
17038 | 243 UNREAD(c) to unread c to be read again. |
244 | |
88886 | 245 These macros correctly read/unread multibyte characters. */ |
341 | 246 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
247 #define READCHAR readchar (readcharfun, NULL) |
341 | 248 #define UNREAD(c) unreadchar (readcharfun, c) |
249 | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
250 /* Same as READCHAR but set *MULTIBYTE to the multibyteness of the source. */ |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
251 #define READCHAR_REPORT_MULTIBYTE(multibyte) readchar (readcharfun, multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
252 |
88886 | 253 /* When READCHARFUN is Qget_file_char, Qget_emacs_mule_file_char, |
89483 | 254 Qlambda, or a cons, we use this to keep an unread character because |
255 a file stream can't handle multibyte-char unreading. The value -1 | |
88886 | 256 means that there's no unread character. */ |
257 static int unread_char; | |
258 | |
341 | 259 static int |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
260 readchar (readcharfun, multibyte) |
341 | 261 Lisp_Object readcharfun; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
262 int *multibyte; |
341 | 263 { |
264 Lisp_Object tem; | |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
265 register int c; |
88886 | 266 int (*readbyte) P_ ((int, Lisp_Object)); |
267 unsigned char buf[MAX_MULTIBYTE_LENGTH]; | |
268 int i, len; | |
269 int emacs_mule_encoding = 0; | |
341 | 270 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
271 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
272 *multibyte = 0; |
341 | 273 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
274 readchar_count++; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
275 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
276 if (BUFFERP (readcharfun)) |
341 | 277 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
278 register struct buffer *inbuffer = XBUFFER (readcharfun); |
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 int pt_byte = BUF_PT_BYTE (inbuffer); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
281 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
282 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
|
283 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
284 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
285 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
286 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
287 /* 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
|
288 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
|
289 BUF_INC_POS (inbuffer, pt_byte); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
290 c = STRING_CHAR (p, pt_byte - orig_pt_byte); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
291 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
292 *multibyte = 1; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
293 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
294 else |
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 c = BUF_FETCH_BYTE (inbuffer, pt_byte); |
88886 | 297 if (! ASCII_BYTE_P (c)) |
298 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
299 pt_byte++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
300 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
301 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
|
302 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
303 return c; |
341 | 304 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
305 if (MARKERP (readcharfun)) |
341 | 306 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
307 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
|
308 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
309 int bytepos = marker_byte_position (readcharfun); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
310 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
311 if (bytepos >= BUF_ZV_BYTE (inbuffer)) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
312 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
313 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
314 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
315 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
316 /* 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
|
317 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
|
318 BUF_INC_POS (inbuffer, bytepos); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
319 c = STRING_CHAR (p, bytepos - orig_bytepos); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
320 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
321 *multibyte = 1; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
322 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
323 else |
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 c = BUF_FETCH_BYTE (inbuffer, bytepos); |
88886 | 326 if (! ASCII_BYTE_P (c)) |
327 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
328 bytepos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
329 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
330 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
331 XMARKER (readcharfun)->bytepos = bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
332 XMARKER (readcharfun)->charpos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
333 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
334 return c; |
341 | 335 } |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
336 |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
337 if (EQ (readcharfun, Qlambda)) |
88886 | 338 { |
339 readbyte = readbyte_for_lambda; | |
340 goto read_multibyte; | |
341 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
342 |
341 | 343 if (EQ (readcharfun, Qget_file_char)) |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
344 { |
88886 | 345 readbyte = readbyte_from_file; |
346 goto read_multibyte; | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
347 } |
341 | 348 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
349 if (STRINGP (readcharfun)) |
341 | 350 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
351 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
|
352 c = -1; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
353 else if (STRING_MULTIBYTE (readcharfun)) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
354 { |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
355 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
356 *multibyte = 1; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
357 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, readcharfun, |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
358 read_from_string_index, |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
359 read_from_string_index_byte); |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
360 } |
29014
4c02859dda27
(read1): On reading multibyte string, be sure to make
Kenichi Handa <handa@m17n.org>
parents:
28746
diff
changeset
|
361 else |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
362 { |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
363 c = SREF (readcharfun, read_from_string_index_byte); |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
364 read_from_string_index++; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
365 read_from_string_index_byte++; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
366 } |
341 | 367 return c; |
368 } | |
369 | |
88886 | 370 if (CONSP (readcharfun)) |
371 { | |
372 /* This is the case that read_vector is reading from a unibyte | |
373 string that contains a byte sequence previously skipped | |
374 because of #@NUMBER. The car part of readcharfun is that | |
375 string, and the cdr part is a value of readcharfun given to | |
376 read_vector. */ | |
377 readbyte = readbyte_from_string; | |
378 if (EQ (XCDR (readcharfun), Qget_emacs_mule_file_char)) | |
379 emacs_mule_encoding = 1; | |
380 goto read_multibyte; | |
381 } | |
89483 | 382 |
88886 | 383 if (EQ (readcharfun, Qget_emacs_mule_file_char)) |
384 { | |
385 readbyte = readbyte_from_file; | |
386 emacs_mule_encoding = 1; | |
387 goto read_multibyte; | |
388 } | |
341 | 389 |
390 tem = call0 (readcharfun); | |
391 | |
485 | 392 if (NILP (tem)) |
341 | 393 return -1; |
394 return XINT (tem); | |
88886 | 395 |
396 read_multibyte: | |
397 if (unread_char >= 0) | |
398 { | |
399 c = unread_char; | |
400 unread_char = -1; | |
401 return c; | |
402 } | |
403 c = (*readbyte) (-1, readcharfun); | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
404 if (c < 0 || load_each_byte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
405 return c; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
406 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
407 *multibyte = 1; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
408 if (ASCII_BYTE_P (c)) |
88886 | 409 return c; |
410 if (emacs_mule_encoding) | |
411 return read_emacs_mule_char (c, readbyte, readcharfun); | |
412 i = 0; | |
413 buf[i++] = c; | |
414 len = BYTES_BY_CHAR_HEAD (c); | |
415 while (i < len) | |
416 { | |
417 c = (*readbyte) (-1, readcharfun); | |
418 if (c < 0 || ! TRAILING_CODE_P (c)) | |
419 { | |
420 while (--i > 1) | |
421 (*readbyte) (buf[i], readcharfun); | |
422 return BYTE8_TO_CHAR (buf[0]); | |
423 } | |
424 buf[i++] = c; | |
425 } | |
426 return STRING_CHAR (buf, i); | |
341 | 427 } |
428 | |
429 /* Unread the character C in the way appropriate for the stream READCHARFUN. | |
430 If the stream is a user function, call it with the char as argument. */ | |
431 | |
432 static void | |
433 unreadchar (readcharfun, c) | |
434 Lisp_Object readcharfun; | |
435 int c; | |
436 { | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
437 readchar_count--; |
6471
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
438 if (c == -1) |
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
439 /* 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
|
440 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
|
441 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
442 else if (BUFFERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
443 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
444 struct buffer *b = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
445 int bytepos = BUF_PT_BYTE (b); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
446 |
88886 | 447 BUF_PT (b)--; |
448 if (! NILP (b->enable_multibyte_characters)) | |
449 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
450 else |
88886 | 451 bytepos--; |
452 | |
453 BUF_PT_BYTE (b) = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
454 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
455 else if (MARKERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
456 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
457 struct buffer *b = XMARKER (readcharfun)->buffer; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
458 int bytepos = XMARKER (readcharfun)->bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
459 |
88886 | 460 XMARKER (readcharfun)->charpos--; |
461 if (! NILP (b->enable_multibyte_characters)) | |
462 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
463 else |
88886 | 464 bytepos--; |
465 | |
466 XMARKER (readcharfun)->bytepos = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
467 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
468 else if (STRINGP (readcharfun)) |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
469 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
470 read_from_string_index--; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
471 read_from_string_index_byte |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
472 = 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
|
473 } |
88886 | 474 else if (CONSP (readcharfun)) |
475 { | |
476 unread_char = c; | |
477 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
478 else if (EQ (readcharfun, Qlambda)) |
88886 | 479 { |
480 unread_char = c; | |
481 } | |
482 else if (EQ (readcharfun, Qget_file_char) | |
483 || EQ (readcharfun, Qget_emacs_mule_file_char)) | |
484 { | |
485 if (load_each_byte) | |
90789 | 486 { |
487 BLOCK_INPUT; | |
488 ungetc (c, instream); | |
489 UNBLOCK_INPUT; | |
490 } | |
88886 | 491 else |
492 unread_char = c; | |
493 } | |
341 | 494 else |
495 call1 (readcharfun, make_number (c)); | |
496 } | |
497 | |
88886 | 498 static int |
499 readbyte_for_lambda (c, readcharfun) | |
500 int c; | |
501 Lisp_Object readcharfun; | |
502 { | |
503 return read_bytecode_char (c >= 0); | |
504 } | |
505 | |
506 | |
507 static int | |
508 readbyte_from_file (c, readcharfun) | |
509 int c; | |
510 Lisp_Object readcharfun; | |
511 { | |
512 if (c >= 0) | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
513 { |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
514 BLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
515 ungetc (c, instream); |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
516 UNBLOCK_INPUT; |
88886 | 517 return 0; |
518 } | |
519 | |
90789 | 520 BLOCK_INPUT; |
88886 | 521 c = getc (instream); |
90789 | 522 |
88886 | 523 #ifdef EINTR |
90789 | 524 /* Interrupted reads have been observed while reading over the network */ |
525 while (c == EOF && ferror (instream) && errno == EINTR) | |
526 { | |
90796 | 527 UNBLOCK_INPUT; |
90789 | 528 QUIT; |
529 BLOCK_INPUT; | |
90796 | 530 clearerr (instream); |
90789 | 531 c = getc (instream); |
532 } | |
88886 | 533 #endif |
90789 | 534 |
90796 | 535 UNBLOCK_INPUT; |
536 | |
88886 | 537 return (c == EOF ? -1 : c); |
538 } | |
539 | |
540 static int | |
541 readbyte_from_string (c, readcharfun) | |
542 int c; | |
543 Lisp_Object readcharfun; | |
544 { | |
545 Lisp_Object string = XCAR (readcharfun); | |
546 | |
547 if (c >= 0) | |
548 { | |
549 read_from_string_index--; | |
550 read_from_string_index_byte | |
551 = string_char_to_byte (string, read_from_string_index); | |
552 } | |
89483 | 553 |
88886 | 554 if (read_from_string_index >= read_from_string_limit) |
555 c = -1; | |
556 else | |
557 FETCH_STRING_CHAR_ADVANCE (c, string, | |
558 read_from_string_index, | |
559 read_from_string_index_byte); | |
560 return c; | |
561 } | |
562 | |
563 | |
564 /* Read one non-ASCII character from INSTREAM. The character is | |
565 encoded in `emacs-mule' and the first byte is already read in | |
566 C. */ | |
567 | |
568 extern char emacs_mule_bytes[256]; | |
569 | |
570 static int | |
571 read_emacs_mule_char (c, readbyte, readcharfun) | |
572 int c; | |
573 int (*readbyte) P_ ((int, Lisp_Object)); | |
574 Lisp_Object readcharfun; | |
575 { | |
576 /* Emacs-mule coding uses at most 4-byte for one character. */ | |
577 unsigned char buf[4]; | |
578 int len = emacs_mule_bytes[c]; | |
579 struct charset *charset; | |
580 int i; | |
581 unsigned code; | |
582 | |
583 if (len == 1) | |
584 /* C is not a valid leading-code of `emacs-mule'. */ | |
585 return BYTE8_TO_CHAR (c); | |
586 | |
587 i = 0; | |
588 buf[i++] = c; | |
589 while (i < len) | |
590 { | |
591 c = (*readbyte) (-1, readcharfun); | |
592 if (c < 0xA0) | |
593 { | |
594 while (--i > 1) | |
595 (*readbyte) (buf[i], readcharfun); | |
596 return BYTE8_TO_CHAR (buf[0]); | |
597 } | |
598 buf[i++] = c; | |
599 } | |
600 | |
601 if (len == 2) | |
602 { | |
89417 | 603 charset = emacs_mule_charset[buf[0]]; |
88886 | 604 code = buf[1] & 0x7F; |
605 } | |
606 else if (len == 3) | |
607 { | |
608 if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 | |
609 || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) | |
610 { | |
611 charset = emacs_mule_charset[buf[1]]; | |
612 code = buf[2] & 0x7F; | |
613 } | |
614 else | |
615 { | |
616 charset = emacs_mule_charset[buf[0]]; | |
617 code = ((buf[1] << 8) | buf[2]) & 0x7F7F; | |
618 } | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
619 } |
341 | 620 else |
88886 | 621 { |
622 charset = emacs_mule_charset[buf[1]]; | |
89483 | 623 code = ((buf[2] << 8) | buf[3]) & 0x7F7F; |
88886 | 624 } |
625 c = DECODE_CHAR (charset, code); | |
626 if (c < 0) | |
627 Fsignal (Qinvalid_read_syntax, | |
628 Fcons (build_string ("invalid multibyte form"), Qnil)); | |
629 return c; | |
341 | 630 } |
631 | |
88886 | 632 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
633 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
|
634 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
635 static Lisp_Object read0 P_ ((Lisp_Object)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
636 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
|
637 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
638 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
|
639 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
|
640 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
641 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
|
642 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
643 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
|
644 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
645 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
|
646 |
341 | 647 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
648 /* Get a character from the tty. */ |
341 | 649 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
650 /* 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
|
651 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
652 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
|
653 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
|
654 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
|
655 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
656 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
|
657 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
|
658 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
|
659 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
660 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
|
661 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
|
662 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
|
663 character. |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
664 |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
665 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
|
666 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
|
667 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
668 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
|
669 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
|
670 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
671 Lisp_Object |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
672 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
|
673 input_method, seconds) |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
674 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
|
675 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
|
676 { |
71672
9c4db0e8490f
(read_filtered_event): Remove `register' qualifier because it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71558
diff
changeset
|
677 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
|
678 EMACS_TIME end_time; |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
679 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
680 #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
|
681 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
682 cancel_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
683 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
684 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
685 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
|
686 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
687 /* Compute timeout. */ |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
688 if (NUMBERP (seconds)) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
689 { |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
690 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
|
691 int sec, usec; |
74566
040d179fb669
(Feval_buffer, Feval_region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73800
diff
changeset
|
692 double duration = extract_float (seconds); |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
693 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
694 sec = (int) duration; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
695 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
|
696 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
|
697 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
|
698 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
|
699 } |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
700 |
83533 | 701 /* Read until we get an acceptable event. */ |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
702 retry: |
85000
2c723350c8ec
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84465
diff
changeset
|
703 do |
83533 | 704 val = read_char (0, 0, 0, (input_method ? Qnil : Qt), 0, |
705 NUMBERP (seconds) ? &end_time : NULL); | |
83460
dbd791ef90a1
Eliminate wrong_kboard_jmpbuf.
Karoly Lorentey <lorentey@elte.hu>
parents:
83450
diff
changeset
|
706 while (INTEGERP (val) && XINT (val) == -2); /* wrong_kboard_jmpbuf */ |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
707 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
708 if (BUFFERP (val)) |
5888
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
709 goto retry; |
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
710 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
711 /* switch-frame events are put off until after the next ASCII |
14036 | 712 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
|
713 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
|
714 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
|
715 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
|
716 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
|
717 && 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
|
718 && 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
|
719 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
720 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
|
721 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
722 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
723 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
724 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
|
725 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
726 /* 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
|
727 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
|
728 { |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
729 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
|
730 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
|
731 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
|
732 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
733 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
|
734 /* 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
|
735 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
|
736 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
|
737 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
|
738 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
739 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
740 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
741 /* 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
|
742 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
|
743 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
744 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
|
745 { |
7106
06542cc6ddcd
(read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
746 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
|
747 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
|
748 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
749 else |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
750 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
751 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
752 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
753 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
754 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
|
755 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
|
756 |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
757 #if 0 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
758 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
759 #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
|
760 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
761 start_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
762 #endif |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
763 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
764 #endif |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
765 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
766 return val; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
767 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
768 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
769 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
|
770 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
|
771 It is returned as a number. |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
772 If the character has modifiers, they are resolved and reflected to the |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
773 character code if possible (e.g. C-SPC -> 0). |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
774 |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
775 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
|
776 click or function key event), `read-char' signals an error. As an |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
777 exception, switch-frame events are put off until non-character events |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
778 can be read. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
779 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
|
780 `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
|
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 { |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
793 Lisp_Object val; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
794 int c; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
795 |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
796 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
797 message_with_string ("%s", prompt, 0); |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
798 val = read_filtered_event (1, 1, 1, ! NILP (inherit_input_method), seconds); |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
799 c = XINT (val); |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
800 return make_number (char_resolve_modifier_mask (c)); |
341 | 801 } |
802 | |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
803 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
|
804 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
|
805 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
|
806 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
|
807 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
|
808 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
|
809 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
|
810 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
|
811 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
|
812 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
813 (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
|
814 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
|
815 { |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
816 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
817 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
|
818 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
|
819 } |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
820 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
821 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
|
822 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
|
823 It is returned as a number. Non-character events are ignored. |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
824 If the character has modifiers, they are resolved and reflected to the |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
825 character code if possible (e.g. C-SPC -> 0). |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
826 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
827 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
|
828 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
|
829 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
|
830 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
|
831 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
|
832 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
|
833 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
|
834 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
835 (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
|
836 Lisp_Object prompt, inherit_input_method, seconds; |
341 | 837 { |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
838 Lisp_Object val; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
839 int c; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
840 |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
841 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
842 message_with_string ("%s", prompt, 0); |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
843 val = read_filtered_event (1, 1, 0, ! NILP (inherit_input_method), seconds); |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
844 c = XINT (val); |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
845 return make_number (char_resolve_modifier_mask (c)); |
341 | 846 } |
847 | |
848 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
|
849 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
|
850 () |
341 | 851 { |
852 register Lisp_Object val; | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
853 BLOCK_INPUT; |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
854 XSETINT (val, getc (instream)); |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
855 UNBLOCK_INPUT; |
341 | 856 return val; |
857 } | |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
858 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
859 |
341 | 860 |
88886 | 861 /* Value is a version number of byte compiled code if the file |
91041 | 862 associated with file descriptor FD is a compiled Lisp file that's |
88886 | 863 safe to load. Only files compiled with Emacs are safe to load. |
864 Files compiled with XEmacs can lead to a crash in Fbyte_code | |
865 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
|
866 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
867 static int |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
868 safe_to_load_p (fd) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
869 int fd; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
870 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
871 char buf[512]; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
872 int nbytes, i; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
873 int safe_p = 1; |
89483 | 874 int version = 1; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
875 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
876 /* 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
|
877 specifying the byte compiler version used. */ |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
878 nbytes = emacs_read (fd, buf, sizeof buf - 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
879 if (nbytes > 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
880 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
881 buf[nbytes] = '\0'; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
882 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
883 /* Skip to the next newline, skipping over the initial `ELC' |
88774 | 884 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
|
885 for (i = 0; i < nbytes && buf[i] != '\n'; ++i) |
88774 | 886 if (i == 4) |
88886 | 887 version = buf[i]; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
888 |
89012
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
889 if (i == nbytes |
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
890 || 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
|
891 buf + i) < 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
892 safe_p = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
893 } |
88774 | 894 if (safe_p) |
895 safe_p = version; | |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
896 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
897 lseek (fd, 0, SEEK_SET); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
898 return safe_p; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
899 } |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
900 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
901 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
902 /* 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
|
903 after loading a file successfully. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
904 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
905 static Lisp_Object |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
906 record_load_unwind (old) |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
907 Lisp_Object old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
908 { |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
909 return Vloads_in_progress = old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
910 } |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
911 |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
912 /* 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
|
913 |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
914 static Lisp_Object |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
915 load_error_handler (data) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
916 Lisp_Object data; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
917 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
918 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
919 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
920 |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
921 static Lisp_Object |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
922 load_warn_old_style_backquotes (file) |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
923 Lisp_Object file; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
924 { |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
925 if (!NILP (Vold_style_backquotes)) |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
926 { |
78628
29320ef98233
(load_warn_old_style_backquotes): Fix up array size typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78617
diff
changeset
|
927 Lisp_Object args[2]; |
84465
bf23b0b54ed3
(load_warn_old_style_backquotes): Change message to look
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83676
diff
changeset
|
928 args[0] = build_string ("Loading `%s': old-style backquotes detected!"); |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
929 args[1] = file; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
930 Fmessage (2, args); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
931 } |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
932 return Qnil; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
933 } |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
934 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
935 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
|
936 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
|
937 required. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
938 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
|
939 () |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
940 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
941 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
|
942 while (CONSP (suffixes)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
943 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
944 Lisp_Object exts = Vload_file_rep_suffixes; |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
945 suffix = XCAR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
946 suffixes = XCDR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
947 while (CONSP (exts)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
948 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
949 ext = XCAR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
950 exts = XCDR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
951 lst = Fcons (concat2 (suffix, ext), lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
952 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
953 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
954 return Fnreverse (lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
955 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
956 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
957 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
|
958 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
|
959 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
|
960 then try FILE unmodified (the exact suffixes in the exact order are |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
961 determined by `load-suffixes'). Environment variable references in |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
962 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
|
963 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
|
964 |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
965 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
|
966 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
|
967 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
|
968 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
|
969 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
|
970 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
|
971 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
|
972 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
|
973 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
|
974 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
975 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
|
976 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
|
977 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
|
978 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
|
979 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
|
980 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
981 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
|
982 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
|
983 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
|
984 `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
|
985 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
|
986 and then the former. |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
987 |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
988 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
|
989 `require' calls, in an element of `load-history' whose |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
990 car is the file name loaded. See `load-history'. |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
991 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
992 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
|
993 (file, noerror, nomessage, nosuffix, must_suffix) |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
994 Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; |
341 | 995 { |
996 register FILE *stream; | |
997 register int fd = -1; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
998 int count = SPECPDL_INDEX (); |
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
|
999 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
|
1000 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
|
1001 /* 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
|
1002 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
|
1003 /* 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
|
1004 int compiled = 0; |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
1005 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
|
1006 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
|
1007 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
|
1008 Lisp_Object tmp[2]; |
88886 | 1009 int version; |
1010 | |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
1011 #ifdef DOS_NT |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1012 fmode = "rt"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
1013 #endif /* DOS_NT */ |
341 | 1014 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1015 CHECK_STRING (file); |
341 | 1016 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
1017 /* 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
|
1018 /* 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
|
1019 handler = Ffind_file_name_handler (file, Qload); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1020 if (!NILP (handler)) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1021 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
|
1022 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
1023 /* 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
|
1024 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
|
1025 (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
|
1026 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
|
1027 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
|
1028 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
|
1029 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
|
1030 that it seemed risky to remove. */ |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1031 if (! NILP (noerror)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1032 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1033 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
|
1034 Qt, load_error_handler); |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1035 if (NILP (file)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1036 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1037 } |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1038 else |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1039 file = Fsubstitute_in_file_name (file); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
1040 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
1041 |
341 | 1042 /* Avoid weird lossage with null string as arg, |
1043 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
|
1044 if (SCHARS (file) > 0) |
341 | 1045 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1046 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
|
1047 |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1048 found = Qnil; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1049 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
|
1050 |
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
|
1051 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
|
1052 { |
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
|
1053 /* 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
|
1054 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
|
1055 && !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
|
1056 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
|
1057 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
|
1058 && !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
|
1059 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
|
1060 /* 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
|
1061 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
|
1062 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
|
1063 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
|
1064 } |
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
|
1065 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
1066 fd = openp (Vload_path, file, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1067 (!NILP (nosuffix) ? Qnil |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1068 : !NILP (must_suffix) ? Fget_load_suffixes () |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1069 : Fappend (2, (tmp[0] = Fget_load_suffixes (), |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1070 tmp[1] = Vload_file_rep_suffixes, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1071 tmp))), |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1072 &found, Qnil); |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1073 UNGCPRO; |
341 | 1074 } |
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 == -1) |
341 | 1077 { |
485 | 1078 if (NILP (noerror)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1079 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
|
1080 return Qnil; |
341 | 1081 } |
1082 | |
29122
47f68a566622
(Fload): Add a comment about the meaning of
Gerd Moellmann <gerd@gnu.org>
parents:
29014
diff
changeset
|
1083 /* 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
|
1084 if (EQ (Qt, Vuser_init_file)) |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1085 Vuser_init_file = found; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1086 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1087 /* 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
|
1088 if (fd == -2) |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1089 { |
23193
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1090 if (NILP (Fequal (found, file))) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1091 /* 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
|
1092 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
|
1093 the `load' operation on FILE. */ |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1094 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
|
1095 else |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1096 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
|
1097 if (! NILP (handler)) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1098 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
|
1099 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1100 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1101 /* 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
|
1102 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1103 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
|
1104 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
|
1105 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
|
1106 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
|
1107 leads to a certain amount of ``normal'' recursion. |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1108 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1109 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
|
1110 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
|
1111 { |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1112 int count = 0; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1113 Lisp_Object tem; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1114 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
|
1115 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
|
1116 count++; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1117 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
|
1118 { |
581e383fb47c
(Fload): Don't leak the file descriptor returned by openp if we are going
Eli Zaretskii <eliz@gnu.org>
parents:
67906
diff
changeset
|
1119 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
|
1120 emacs_close (fd); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1121 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
|
1122 } |
41463
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1123 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
|
1124 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
|
1125 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1126 |
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
|
1127 /* 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
|
1128 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
|
1129 ? 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
|
1130 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
|
1131 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
|
1132 : 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
|
1133 |
88886 | 1134 version = -1; |
91015 | 1135 |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
1136 /* Check for the presence of old-style quotes and warn about them. */ |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
1137 specbind (Qold_style_backquotes, Qnil); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
1138 record_unwind_protect (load_warn_old_style_backquotes, file); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
1139 |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1140 if (!bcmp (SDATA (found) + SBYTES (found) - 4, |
88886 | 1141 ".elc", 4) |
1142 || (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
|
1143 /* 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
|
1144 remote and have no handler! */ |
341 | 1145 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1146 if (fd != -2) |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1147 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1148 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
|
1149 int result; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1150 |
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
|
1151 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1152 |
88886 | 1153 if (version < 0 |
1154 && ! (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
|
1155 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1156 safe_p = 0; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1157 if (!load_dangerous_libraries) |
48087
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1158 { |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1159 if (fd >= 0) |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1160 emacs_close (fd); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1161 error ("File `%s' was not compiled in Emacs", |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1162 SDATA (found)); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1163 } |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1164 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
|
1165 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
|
1166 } |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1167 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1168 compiled = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1169 |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1170 efound = ENCODE_FILE (found); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1171 |
33570 | 1172 #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
|
1173 fmode = "rb"; |
33570 | 1174 #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
|
1175 stat ((char *)SDATA (efound), &s1); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1176 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
|
1177 result = stat ((char *)SDATA (efound), &s2); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1178 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
|
1179 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1180 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
|
1181 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1182 /* 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
|
1183 newer = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1184 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1185 /* 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
|
1186 if (!NILP (nomessage)) |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1187 { |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1188 Lisp_Object msg_file; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1189 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
|
1190 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
|
1191 msg_file, 1); |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1192 } |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1193 } |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1194 UNGCPRO; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1195 } |
341 | 1196 } |
17038 | 1197 else |
1198 { | |
1199 /* We are loading a source file (*.el). */ | |
1200 if (!NILP (Vload_source_file_function)) | |
1201 { | |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1202 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
|
1203 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1204 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
|
1205 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
|
1206 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
|
1207 NILP (noerror) ? Qnil : Qt, |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1208 NILP (nomessage) ? Qnil : Qt); |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1209 return unbind_to (count, val); |
17038 | 1210 } |
1211 } | |
341 | 1212 |
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
|
1213 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1214 |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1215 #ifdef WINDOWSNT |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1216 emacs_close (fd); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1217 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
|
1218 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
|
1219 #else /* not WINDOWSNT */ |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1220 stream = fdopen (fd, fmode); |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1221 #endif /* not WINDOWSNT */ |
341 | 1222 if (stream == 0) |
1223 { | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1224 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
|
1225 error ("Failure to create stdio stream for %s", SDATA (file)); |
341 | 1226 } |
1227 | |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1228 if (! NILP (Vpurify_flag)) |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1229 Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list); |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1230 |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
1231 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
|
1232 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1233 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1234 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
|
1235 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1236 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1237 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
|
1238 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1239 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
|
1240 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1241 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
|
1242 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
|
1243 } |
341 | 1244 |
64533
dc17db575e11
(Fload, load_unwind): Use make_save_value to unwind
Kim F. Storm <storm@cua.dk>
parents:
64317
diff
changeset
|
1245 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
|
1246 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
|
1247 specbind (Qload_file_name, found); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1248 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
|
1249 load_descriptor_list |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1250 = Fcons (make_number (fileno (stream)), load_descriptor_list); |
341 | 1251 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
|
1252 if (! version || version >= 22) |
90428 | 1253 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
|
1254 Feval, 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1255 else |
1256 { | |
1257 /* We can't handle a file which was compiled with | |
1258 byte-compile-dynamic by older version of Emacs. */ | |
1259 specbind (Qload_force_doc_strings, Qt); | |
90428 | 1260 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
|
1261 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1262 } |
341 | 1263 unbind_to (count, Qnil); |
1264 | |
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
|
1265 /* 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
|
1266 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
|
1267 && (!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
|
1268 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
|
1269 |
341 | 1270 UNGCPRO; |
1271 | |
95860
353a9f7910cf
* lread.c (Fload): Use xfree, not free on saved_doc_string.
Jim Meyering <jim@meyering.net>
parents:
95481
diff
changeset
|
1272 xfree (saved_doc_string); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1273 saved_doc_string = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1274 saved_doc_string_size = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1275 |
95481
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95479
diff
changeset
|
1276 xfree (prev_saved_doc_string); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1277 prev_saved_doc_string = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1278 prev_saved_doc_string_size = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1279 |
485 | 1280 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
|
1281 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1282 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1283 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
|
1284 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1285 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1286 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
|
1287 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1288 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
|
1289 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1290 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
|
1291 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
|
1292 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1293 |
51066
0c125011ae21
(Fload): Print a message if package is obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50513
diff
changeset
|
1294 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
|
1295 Ffile_name_nondirectory |
0c125011ae21
(Fload): Print a message if package is obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50513
diff
changeset
|
1296 (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
|
1297 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
|
1298 |
341 | 1299 return Qt; |
1300 } | |
1301 | |
1302 static Lisp_Object | |
64536
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1303 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
|
1304 Lisp_Object arg; |
341 | 1305 { |
64536
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1306 FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; |
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1307 if (stream != NULL) |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1308 { |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1309 BLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1310 fclose (stream); |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1311 UNBLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1312 } |
341 | 1313 if (--load_in_progress < 0) load_in_progress = 0; |
1314 return Qnil; | |
1315 } | |
1316 | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1317 static Lisp_Object |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1318 load_descriptor_unwind (oldlist) |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1319 Lisp_Object oldlist; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1320 { |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1321 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
|
1322 return Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1323 } |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1324 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1325 /* 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
|
1326 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
|
1327 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1328 void |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1329 close_load_descs () |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1330 { |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1331 #ifndef WINDOWSNT |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1332 Lisp_Object tail; |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85127
diff
changeset
|
1333 for (tail = load_descriptor_list; CONSP (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
|
1334 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
|
1335 #endif |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1336 } |
341 | 1337 |
1338 static int | |
1339 complete_filename_p (pathname) | |
1340 Lisp_Object pathname; | |
1341 { | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1342 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
|
1343 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
|
1344 || (SCHARS (pathname) > 2 |
97142 | 1345 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))); |
341 | 1346 } |
1347 | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1348 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
|
1349 doc: /* Search for FILENAME through PATH. |
62116
f1b7fe92d96a
(Flocate_file_internal): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
61623
diff
changeset
|
1350 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
|
1351 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
|
1352 file name when searching. |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1353 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
|
1354 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
|
1355 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
|
1356 (filename, path, suffixes, predicate) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1357 Lisp_Object filename, path, suffixes, predicate; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1358 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1359 Lisp_Object file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1360 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
|
1361 if (NILP (predicate) && fd > 0) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1362 close (fd); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1363 return file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1364 } |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1365 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1366 |
341 | 1367 /* Search for a file whose name is STR, looking in directories |
1368 in the Lisp list PATH, and trying suffixes from SUFFIX. | |
1369 On success, returns a file descriptor. On failure, returns -1. | |
1370 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1371 SUFFIXES is a list of strings containing possible suffixes. |
78501 | 1372 The empty suffix is automatically added if the list is empty. |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1373 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1374 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
|
1375 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
|
1376 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
|
1377 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
|
1378 are ignored). |
341 | 1379 |
1380 If STOREPTR is nonzero, it points to a slot where the name of | |
1381 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
|
1382 nil is stored there on failure. |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1383 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1384 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
|
1385 but store the found remote file name in *STOREPTR. */ |
341 | 1386 |
1387 int | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1388 openp (path, str, suffixes, storeptr, predicate) |
341 | 1389 Lisp_Object path, str; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1390 Lisp_Object suffixes; |
341 | 1391 Lisp_Object *storeptr; |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1392 Lisp_Object predicate; |
341 | 1393 { |
1394 register int fd; | |
1395 int fn_size = 100; | |
1396 char buf[100]; | |
1397 register char *fn = buf; | |
1398 int absolute = 0; | |
1399 int want_size; | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1400 Lisp_Object filename; |
341 | 1401 struct stat st; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1402 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
|
1403 Lisp_Object string, tail, encoded_fn; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1404 int max_suffix_len = 0; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1405 |
51380
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1406 CHECK_STRING (str); |
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1407 |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1408 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
|
1409 { |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
1410 CHECK_STRING_CAR (tail); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1411 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
|
1412 SBYTES (XCAR (tail))); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1413 } |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1414 |
68649
70566c3d72b1
(openp): Initialized encoded_fn before GCPRO it.
Kenichi Handa <handa@m17n.org>
parents:
68301
diff
changeset
|
1415 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
|
1416 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
|
1417 |
341 | 1418 if (storeptr) |
1419 *storeptr = Qnil; | |
1420 | |
1421 if (complete_filename_p (str)) | |
1422 absolute = 1; | |
1423 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1424 for (; CONSP (path); path = XCDR (path)) |
341 | 1425 { |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1426 filename = Fexpand_file_name (str, XCAR (path)); |
341 | 1427 if (!complete_filename_p (filename)) |
1428 /* If there are non-absolute elts in PATH (eg ".") */ | |
1429 /* Of course, this could conceivably lose if luser sets | |
1430 default-directory to be something non-absolute... */ | |
1431 { | |
1432 filename = Fexpand_file_name (filename, current_buffer->directory); | |
1433 if (!complete_filename_p (filename)) | |
1434 /* Give up on this path element! */ | |
1435 continue; | |
1436 } | |
1437 | |
1438 /* Calculate maximum size of any filename made from | |
1439 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
|
1440 want_size = max_suffix_len + SBYTES (filename) + 1; |
341 | 1441 if (fn_size < want_size) |
1442 fn = (char *) alloca (fn_size = 100 + want_size); | |
1443 | |
1444 /* Loop over suffixes. */ | |
81270
0bf4e298d593
(syms_of_lread, openp): Use empty_unibyte_string, not build_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
80808
diff
changeset
|
1445 for (tail = NILP (suffixes) ? Fcons (empty_unibyte_string, Qnil) : suffixes; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1446 CONSP (tail); tail = XCDR (tail)) |
341 | 1447 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1448 int lsuffix = SBYTES (XCAR (tail)); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1449 Lisp_Object handler; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1450 int exists; |
341 | 1451 |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1452 /* 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
|
1453 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
|
1454 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
|
1455 && 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
|
1456 && SREF (filename, 1) == ':') |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1457 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1458 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
|
1459 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
|
1460 fn[SBYTES (filename) - 2] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1461 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1462 else |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1463 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1464 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
|
1465 SBYTES (filename)); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1466 fn[SBYTES (filename)] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1467 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1468 |
341 | 1469 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
|
1470 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
|
1471 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1472 /* 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
|
1473 /* 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
|
1474 if (absolute) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1475 handler = Qnil; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1476 else |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1477 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
|
1478 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
|
1479 (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
|
1480 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
|
1481 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
|
1482 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
|
1483 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1484 if (NILP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1485 exists = !NILP (Ffile_readable_p (string)); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1486 else |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1487 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
|
1488 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
|
1489 exists = 0; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1490 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1491 if (exists) |
341 | 1492 { |
1493 /* We succeeded; return this descriptor and filename. */ | |
1494 if (storeptr) | |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1495 *storeptr = string; |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1496 UNGCPRO; |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1497 return -2; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1498 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1499 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1500 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1501 { |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1502 const char *pfn; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1503 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1504 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
|
1505 pfn = SDATA (encoded_fn); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1506 exists = (stat (pfn, &st) >= 0 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1507 && (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
|
1508 if (exists) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1509 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1510 /* 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
|
1511 if (NATNUMP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1512 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
|
1513 else |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1514 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
|
1515 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1516 if (fd >= 0) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1517 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1518 /* 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
|
1519 if (storeptr) |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1520 *storeptr = string; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1521 UNGCPRO; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1522 return fd; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1523 } |
341 | 1524 } |
1525 } | |
1526 } | |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1527 if (absolute) |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1528 break; |
341 | 1529 } |
1530 | |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1531 UNGCPRO; |
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1532 return -1; |
341 | 1533 } |
1534 | |
1535 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1536 /* 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
|
1537 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
|
1538 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
|
1539 |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1540 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
|
1541 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
|
1542 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1543 static void |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1544 build_load_history (filename, entire) |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1545 Lisp_Object filename; |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1546 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
|
1547 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1548 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
|
1549 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
|
1550 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
|
1551 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1552 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
|
1553 prev = Qnil; |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1554 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1555 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
|
1556 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1557 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
|
1558 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1559 /* 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
|
1560 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
|
1561 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1562 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
|
1563 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1564 /* 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
|
1565 if (entire) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1566 { |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1567 if (NILP (prev)) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1568 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
|
1569 else |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1570 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
|
1571 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1572 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1573 /* 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
|
1574 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1575 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1576 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
|
1577 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1578 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
|
1579 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1580 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
|
1581 |
47021
3bd4234e0844
(build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents:
46472
diff
changeset
|
1582 if (NILP (Fmember (newelt, tem))) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1583 Fsetcar (tail, Fcons (XCAR (tem), |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1584 Fcons (newelt, XCDR (tem)))); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1585 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1586 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
|
1587 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1588 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1589 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1590 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1591 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1592 prev = tail; |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1593 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
|
1594 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1595 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1596 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1597 /* 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
|
1598 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
|
1599 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
|
1600 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
|
1601 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
|
1602 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
|
1603 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1604 |
341 | 1605 Lisp_Object |
30917
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1606 unreadpure (junk) /* Used as unwind-protect function in readevalloop */ |
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1607 Lisp_Object junk; |
341 | 1608 { |
1609 read_pure = 0; | |
1610 return Qnil; | |
1611 } | |
1612 | |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1613 static Lisp_Object |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1614 readevalloop_1 (old) |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1615 Lisp_Object old; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1616 { |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1617 load_convert_to_unibyte = ! NILP (old); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1618 return Qnil; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1619 } |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1620 |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1621 /* 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
|
1622 information. */ |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1623 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1624 static void |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1625 end_of_file_error () |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1626 { |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1627 if (STRINGP (Vload_file_name)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1628 xsignal1 (Qend_of_file, Vload_file_name); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1629 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1630 xsignal0 (Qend_of_file); |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1631 } |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1632 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1633 /* 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
|
1634 for this invocation. |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1635 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
|
1636 |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1637 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
|
1638 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
|
1639 |
341 | 1640 static void |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1641 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
|
1642 printflag, unibyte, readfun, start, end) |
341 | 1643 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
|
1644 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
|
1645 Lisp_Object sourcename; |
341 | 1646 Lisp_Object (*evalfun) (); |
1647 int printflag; | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1648 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
|
1649 Lisp_Object start, end; |
341 | 1650 { |
1651 register int c; | |
1652 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1653 int count = SPECPDL_INDEX (); |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1654 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
|
1655 struct buffer *b = 0; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1656 int continue_reading_p; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1657 /* Nonzero if reading an entire buffer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1658 int whole_buffer = 0; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1659 /* 1 on the first time around. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1660 int first_sexp = 1; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1661 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1662 if (MARKERP (readcharfun)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1663 { |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1664 if (NILP (start)) |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1665 start = readcharfun; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1666 } |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1667 |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1668 if (BUFFERP (readcharfun)) |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1669 b = XBUFFER (readcharfun); |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1670 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
|
1671 b = XMARKER (readcharfun)->buffer; |
341 | 1672 |
70595
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1673 /* 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
|
1674 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
|
1675 abort (); |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1676 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1677 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
|
1678 specbind (Qcurrent_load_list, Qnil); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1679 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
|
1680 load_convert_to_unibyte = !NILP (unibyte); |
341 | 1681 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1682 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
|
1683 |
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
|
1684 /* 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
|
1685 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
|
1686 && !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
|
1687 && !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
|
1688 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
|
1689 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1690 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
|
1691 |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1692 continue_reading_p = 1; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1693 while (continue_reading_p) |
341 | 1694 { |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1695 int count1 = SPECPDL_INDEX (); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1696 |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1697 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
|
1698 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
|
1699 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1700 if (!NILP (start)) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1701 { |
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
|
1702 /* 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
|
1703 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
|
1704 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
|
1705 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1706 /* 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
|
1707 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
|
1708 /* 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
|
1709 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
|
1710 /* 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
|
1711 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1712 /* 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
|
1713 Fgoto_char (start); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1714 if (!NILP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1715 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
|
1716 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1717 /* 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
|
1718 if it is an integer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1719 if (INTEGERP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1720 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
|
1721 } |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1722 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1723 /* 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
|
1724 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
|
1725 if (b && first_sexp) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1726 whole_buffer = (PT == BEG && ZV == Z); |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1727 |
341 | 1728 instream = stream; |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1729 read_next: |
341 | 1730 c = READCHAR; |
1731 if (c == ';') | |
1732 { | |
1733 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
|
1734 goto read_next; |
341 | 1735 } |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1736 if (c < 0) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1737 { |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1738 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1739 break; |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1740 } |
10163
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1741 |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1742 /* Ignore whitespace here, so we can detect eof. */ |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1743 if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' |
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1744 || c == 0x8a0) /* NBSP */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1745 goto read_next; |
341 | 1746 |
485 | 1747 if (!NILP (Vpurify_flag) && c == '(') |
341 | 1748 { |
1749 record_unwind_protect (unreadpure, Qnil); | |
1750 val = read_list (-1, readcharfun); | |
1751 } | |
1752 else | |
1753 { | |
1754 UNREAD (c); | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1755 read_objects = Qnil; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1756 if (!NILP (readfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1757 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1758 val = call1 (readfun, readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1759 |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1760 /* 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
|
1761 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
|
1762 to a different value when evaluated. */ |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1763 if (BUFFERP (readcharfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1764 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1765 struct buffer *b = XBUFFER (readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1766 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
|
1767 continue_reading_p = 0; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1768 } |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1769 } |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1770 else if (! NILP (Vload_read_function)) |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1771 val = call1 (Vload_read_function, readcharfun); |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1772 else |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1773 val = read_internal_start (readcharfun, Qnil, Qnil); |
341 | 1774 } |
1775 | |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1776 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
|
1777 start = Fpoint_marker (); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1778 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1779 /* 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
|
1780 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1781 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1782 /* Now eval what we just read. */ |
341 | 1783 val = (*evalfun) (val); |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1784 |
341 | 1785 if (printflag) |
1786 { | |
1787 Vvalues = Fcons (val, Vvalues); | |
1788 if (EQ (Vstandard_output, Qt)) | |
1789 Fprin1 (val, Qnil); | |
1790 else | |
1791 Fprint (val, Qnil); | |
1792 } | |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1793 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1794 first_sexp = 0; |
341 | 1795 } |
1796 | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1797 build_load_history (sourcename, |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1798 stream || whole_buffer); |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1799 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1800 UNGCPRO; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1801 |
341 | 1802 unbind_to (count, Qnil); |
1803 } | |
1804 | |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1805 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
|
1806 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
|
1807 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
|
1808 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
|
1809 PRINTFLAG controls printing of output: |
74566
040d179fb669
(Feval_buffer, Feval_region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73800
diff
changeset
|
1810 A value of nil means discard it; anything else is stream for print. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1811 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1812 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
|
1813 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
|
1814 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
|
1815 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
|
1816 |
48149
8f11dde95c66
(Feval_buffer): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
48087
diff
changeset
|
1817 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
|
1818 `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
|
1819 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1820 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
|
1821 (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
|
1822 Lisp_Object buffer, printflag, filename, unibyte, do_allow_print; |
672 | 1823 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1824 int count = SPECPDL_INDEX (); |
672 | 1825 Lisp_Object tem, buf; |
1826 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1827 if (NILP (buffer)) |
672 | 1828 buf = Fcurrent_buffer (); |
1829 else | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1830 buf = Fget_buffer (buffer); |
673 | 1831 if (NILP (buf)) |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1832 error ("No such buffer"); |
672 | 1833 |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1834 if (NILP (printflag) && NILP (do_allow_print)) |
672 | 1835 tem = Qsymbolp; |
1836 else | |
1837 tem = printflag; | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1838 |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1839 if (NILP (filename)) |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1840 filename = XBUFFER (buf)->filename; |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1841 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1842 specbind (Qeval_buffer_list, Fcons (buf, Veval_buffer_list)); |
672 | 1843 specbind (Qstandard_output, tem); |
1844 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
93110
6d11337f1ad8
* fileio.c (Finsert_file_contents):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92497
diff
changeset
|
1845 BUF_TEMP_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
|
1846 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
|
1847 !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
|
1848 unbind_to (count, Qnil); |
672 | 1849 |
1850 return Qnil; | |
1851 } | |
1852 | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1853 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
|
1854 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
|
1855 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
|
1856 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
|
1857 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
|
1858 Programs can pass third argument PRINTFLAG which controls output: |
74566
040d179fb669
(Feval_buffer, Feval_region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73800
diff
changeset
|
1859 A value of nil means discard it; anything else is stream for printing it. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1860 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
|
1861 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
|
1862 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
|
1863 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1864 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
|
1865 (start, end, printflag, read_function) |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1866 Lisp_Object start, end, printflag, read_function; |
341 | 1867 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1868 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
|
1869 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
|
1870 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1871 cbuf = Fcurrent_buffer (); |
341 | 1872 |
485 | 1873 if (NILP (printflag)) |
341 | 1874 tem = Qsymbolp; |
1875 else | |
1876 tem = printflag; | |
1877 specbind (Qstandard_output, tem); | |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1878 specbind (Qeval_buffer_list, Fcons (cbuf, Veval_buffer_list)); |
341 | 1879 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1880 /* 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
|
1881 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
|
1882 !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
|
1883 start, end); |
341 | 1884 |
1885 return unbind_to (count, Qnil); | |
1886 } | |
1887 | |
1888 | |
1889 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
|
1890 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
|
1891 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
|
1892 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
|
1893 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
|
1894 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
|
1895 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
|
1896 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
|
1897 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
|
1898 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
|
1899 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
|
1900 (stream) |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1901 Lisp_Object stream; |
341 | 1902 { |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1903 if (NILP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1904 stream = Vstandard_input; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1905 if (EQ (stream, Qt)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1906 stream = Qread_char; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1907 if (EQ (stream, Qread_char)) |
341 | 1908 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); |
1909 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1910 return read_internal_start (stream, Qnil, Qnil); |
341 | 1911 } |
1912 | |
1913 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
|
1914 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
|
1915 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
|
1916 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
|
1917 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
|
1918 (string, start, end) |
341 | 1919 Lisp_Object string, start, end; |
1920 { | |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1921 Lisp_Object ret; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1922 CHECK_STRING (string); |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1923 /* read_internal_start sets read_from_string_index. */ |
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1924 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
|
1925 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
|
1926 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1927 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1928 /* 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
|
1929 calls. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1930 static Lisp_Object |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1931 read_internal_start (stream, start, end) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1932 Lisp_Object stream; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1933 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
|
1934 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
|
1935 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1936 Lisp_Object retval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1937 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1938 readchar_count = 0; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1939 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1940 read_objects = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1941 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1942 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1943 Vread_symbol_positions_list = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1944 |
89483 | 1945 if (STRINGP (stream) |
1946 || ((CONSP (stream) && STRINGP (XCAR (stream))))) | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1947 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1948 int startval, endval; |
89483 | 1949 Lisp_Object string; |
1950 | |
1951 if (STRINGP (stream)) | |
1952 string = stream; | |
1953 else | |
1954 string = XCAR (stream); | |
1955 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1956 if (NILP (end)) |
89483 | 1957 endval = SCHARS (string); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1958 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1959 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1960 CHECK_NUMBER (end); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1961 endval = XINT (end); |
89483 | 1962 if (endval < 0 || endval > SCHARS (string)) |
1963 args_out_of_range (string, end); | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1964 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1965 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1966 if (NILP (start)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1967 startval = 0; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1968 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1969 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1970 CHECK_NUMBER (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1971 startval = XINT (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1972 if (startval < 0 || startval > endval) |
89483 | 1973 args_out_of_range (string, start); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1974 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1975 read_from_string_index = startval; |
89483 | 1976 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
|
1977 read_from_string_limit = endval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1978 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
1979 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1980 retval = read0 (stream); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1981 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1982 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1983 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
|
1984 return retval; |
341 | 1985 } |
1986 | |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1987 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1988 /* Signal Qinvalid_read_syntax error. |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1989 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
|
1990 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1991 static void |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1992 invalid_syntax (s, n) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1993 const char *s; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1994 int n; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1995 { |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1996 if (!n) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1997 n = strlen (s); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1998 xsignal1 (Qinvalid_read_syntax, make_string (s, n)); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1999 } |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2000 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2001 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2002 /* 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
|
2003 are not allowed. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2004 |
341 | 2005 static Lisp_Object |
2006 read0 (readcharfun) | |
2007 Lisp_Object readcharfun; | |
2008 { | |
2009 register Lisp_Object val; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2010 int c; |
341 | 2011 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2012 val = read1 (readcharfun, &c, 0); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2013 if (!c) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2014 return val; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2015 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2016 xsignal1 (Qinvalid_read_syntax, |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2017 Fmake_string (make_number (1), make_number (c))); |
341 | 2018 } |
2019 | |
2020 static int read_buffer_size; | |
2021 static char *read_buffer; | |
2022 | |
88886 | 2023 /* Read a \-escape sequence, assuming we already read the `\'. |
89483 | 2024 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
|
2025 |
17038 | 2026 static int |
88886 | 2027 read_escape (readcharfun, stringp) |
341 | 2028 Lisp_Object readcharfun; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2029 int stringp; |
341 | 2030 { |
2031 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
|
2032 /* \u allows up to four hex digits, \U up to eight. Default to the |
96376
c3309dba6542
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96361
diff
changeset
|
2033 behavior for \u, and change this value in the case that \U is seen. */ |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2034 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
|
2035 |
341 | 2036 switch (c) |
2037 { | |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
2038 case -1: |
40931
50b111aed6d5
(read_escape): Use end_of_file_error for reporting eof.
Richard M. Stallman <rms@gnu.org>
parents:
40796
diff
changeset
|
2039 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
|
2040 |
341 | 2041 case 'a': |
485 | 2042 return '\007'; |
341 | 2043 case 'b': |
2044 return '\b'; | |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2045 case 'd': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2046 return 0177; |
341 | 2047 case 'e': |
2048 return 033; | |
2049 case 'f': | |
2050 return '\f'; | |
2051 case 'n': | |
2052 return '\n'; | |
2053 case 'r': | |
2054 return '\r'; | |
2055 case 't': | |
2056 return '\t'; | |
2057 case 'v': | |
2058 return '\v'; | |
2059 case '\n': | |
2060 return -1; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2061 case ' ': |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2062 if (stringp) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2063 return -1; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2064 return ' '; |
341 | 2065 |
2066 case 'M': | |
2067 c = READCHAR; | |
2068 if (c != '-') | |
2069 error ("Invalid escape character syntax"); | |
2070 c = READCHAR; | |
2071 if (c == '\\') | |
88886 | 2072 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2073 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
|
2074 |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2075 case 'S': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2076 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2077 if (c != '-') |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2078 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
|
2079 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2080 if (c == '\\') |
88886 | 2081 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2082 return c | shift_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2083 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2084 case 'H': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2085 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2086 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2087 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2088 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2089 if (c == '\\') |
88886 | 2090 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2091 return c | hyper_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2092 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2093 case 'A': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2094 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2095 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2096 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2097 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2098 if (c == '\\') |
88886 | 2099 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2100 return c | alt_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2101 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2102 case 's': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2103 c = READCHAR; |
80808
d741e1d7761a
(read_escape): In a string, \s is always space.
Richard M. Stallman <rms@gnu.org>
parents:
76777
diff
changeset
|
2104 if (stringp || c != '-') |
67394
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2105 { |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2106 UNREAD (c); |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2107 return ' '; |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2108 } |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2109 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2110 if (c == '\\') |
88886 | 2111 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2112 return c | super_modifier; |
341 | 2113 |
2114 case 'C': | |
2115 c = READCHAR; | |
2116 if (c != '-') | |
2117 error ("Invalid escape character syntax"); | |
2118 case '^': | |
2119 c = READCHAR; | |
2120 if (c == '\\') | |
88886 | 2121 c = read_escape (readcharfun, 0); |
25251
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2122 if ((c & ~CHAR_MODIFIER_MASK) == '?') |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2123 return 0177 | (c & CHAR_MODIFIER_MASK); |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2124 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
|
2125 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
|
2126 /* 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
|
2127 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
|
2128 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
|
2129 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
|
2130 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
|
2131 return (c & (037 | ~0177)); |
341 | 2132 else |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2133 return c | ctrl_modifier; |
341 | 2134 |
2135 case '0': | |
2136 case '1': | |
2137 case '2': | |
2138 case '3': | |
2139 case '4': | |
2140 case '5': | |
2141 case '6': | |
2142 case '7': | |
2143 /* An octal escape, as in ANSI C. */ | |
2144 { | |
2145 register int i = c - '0'; | |
2146 register int count = 0; | |
2147 while (++count < 3) | |
2148 { | |
2149 if ((c = READCHAR) >= '0' && c <= '7') | |
2150 { | |
2151 i *= 8; | |
2152 i += c - '0'; | |
2153 } | |
2154 else | |
2155 { | |
2156 UNREAD (c); | |
2157 break; | |
2158 } | |
2159 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2160 |
89483 | 2161 if (i >= 0x80 && i < 0x100) |
88886 | 2162 i = BYTE8_TO_CHAR (i); |
341 | 2163 return i; |
2164 } | |
2165 | |
2166 case 'x': | |
2167 /* A hex escape, as in ANSI C. */ | |
2168 { | |
2169 int i = 0; | |
88383 | 2170 int count = 0; |
341 | 2171 while (1) |
2172 { | |
2173 c = READCHAR; | |
2174 if (c >= '0' && c <= '9') | |
2175 { | |
2176 i *= 16; | |
2177 i += c - '0'; | |
2178 } | |
2179 else if ((c >= 'a' && c <= 'f') | |
2180 || (c >= 'A' && c <= 'F')) | |
2181 { | |
2182 i *= 16; | |
2183 if (c >= 'a' && c <= 'f') | |
2184 i += c - 'a' + 10; | |
2185 else | |
2186 i += c - 'A' + 10; | |
2187 } | |
2188 else | |
2189 { | |
2190 UNREAD (c); | |
2191 break; | |
2192 } | |
88383 | 2193 count++; |
341 | 2194 } |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2195 |
88383 | 2196 if (count < 3 && i >= 0x80) |
88886 | 2197 return BYTE8_TO_CHAR (i); |
341 | 2198 return i; |
2199 } | |
2200 | |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2201 case 'U': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2202 /* 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
|
2203 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
|
2204 case 'u': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2205 |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2206 /* 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
|
2207 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
|
2208 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2209 int i = 0; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2210 int count = 0; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2211 |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2212 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
|
2213 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2214 c = READCHAR; |
71484
dbe1bcee0357
Fix whitespace of last change.
Eli Zaretskii <eliz@gnu.org>
parents:
71458
diff
changeset
|
2215 /* 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
|
2216 want. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2217 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
|
2218 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
|
2219 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
|
2220 else |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2221 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2222 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
|
2223 break; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2224 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2225 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2226 |
90478
65a8f4ffdbca
(read_escape): Fix the code synched with HEAD.
Kenichi Handa <handa@m17n.org>
parents:
90472
diff
changeset
|
2227 return i; |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2228 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2229 |
341 | 2230 default: |
2231 return c; | |
2232 } | |
2233 } | |
2234 | |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2235 /* Read an integer in radix RADIX using READCHARFUN to read |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2236 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
|
2237 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
|
2238 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
|
2239 range. */ |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2240 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2241 static Lisp_Object |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2242 read_integer (readcharfun, radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2243 Lisp_Object readcharfun; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2244 int radix; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2245 { |
35543
c809110e1433
(read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents:
34604
diff
changeset
|
2246 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
|
2247 EMACS_INT number = 0; |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2248 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2249 if (radix < 2 || radix > 36) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2250 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2251 else |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2252 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2253 number = ndigits = invalid_p = 0; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2254 sign = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2255 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2256 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2257 if (c == '-') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2258 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2259 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2260 sign = -1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2261 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2262 else if (c == '+') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2263 c = READCHAR; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2264 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2265 while (c >= 0) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2266 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2267 int digit; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2268 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2269 if (c >= '0' && c <= '9') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2270 digit = c - '0'; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2271 else if (c >= 'a' && c <= 'z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2272 digit = c - 'a' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2273 else if (c >= 'A' && c <= 'Z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2274 digit = c - 'A' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2275 else |
28190
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2276 { |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2277 UNREAD (c); |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2278 break; |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2279 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2280 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2281 if (digit < 0 || digit >= radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2282 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2283 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2284 number = radix * number + digit; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2285 ++ndigits; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2286 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2287 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2288 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2289 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2290 if (ndigits == 0 || invalid_p) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2291 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2292 char buf[50]; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2293 sprintf (buf, "integer, radix %d", radix); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2294 invalid_syntax (buf, 0); |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2295 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2296 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2297 return make_number (sign * number); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2298 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2299 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2300 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2301 /* 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
|
2302 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
|
2303 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
|
2304 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2305 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
|
2306 |
341 | 2307 static Lisp_Object |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2308 read1 (readcharfun, pch, first_in_list) |
341 | 2309 register Lisp_Object readcharfun; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2310 int *pch; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2311 int first_in_list; |
341 | 2312 { |
2313 register int c; | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2314 int uninterned_symbol = 0; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2315 int multibyte; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2316 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2317 *pch = 0; |
88886 | 2318 load_each_byte = 0; |
341 | 2319 |
2320 retry: | |
2321 | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2322 c = READCHAR_REPORT_MULTIBYTE (&multibyte); |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2323 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2324 end_of_file_error (); |
341 | 2325 |
2326 switch (c) | |
2327 { | |
2328 case '(': | |
2329 return read_list (0, readcharfun); | |
2330 | |
2331 case '[': | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2332 return read_vector (readcharfun, 0); |
341 | 2333 |
2334 case ')': | |
2335 case ']': | |
2336 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2337 *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
|
2338 return Qnil; |
341 | 2339 } |
2340 | |
2341 case '#': | |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2342 c = READCHAR; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2343 if (c == '^') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2344 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2345 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2346 if (c == '[') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2347 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2348 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2349 tmp = read_vector (readcharfun, 0); |
90830
e33fffaa9534
(read1): Use CHAR_TABLE_STANDARD_SLOTS to validate
Andreas Schwab <schwab@suse.de>
parents:
90796
diff
changeset
|
2350 if (XVECTOR (tmp)->size < CHAR_TABLE_STANDARD_SLOTS) |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2351 error ("Invalid size char-table"); |
85356
689fd5665496
(read1): Set pvectype for char_tables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85330
diff
changeset
|
2352 XSETPVECTYPE (XVECTOR (tmp), PVEC_CHAR_TABLE); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2353 return tmp; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2354 } |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2355 else if (c == '^') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2356 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2357 c = READCHAR; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2358 if (c == '[') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2359 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2360 Lisp_Object tmp; |
88383 | 2361 int depth, size; |
89483 | 2362 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2363 tmp = read_vector (readcharfun, 0); |
88383 | 2364 if (!INTEGERP (AREF (tmp, 0))) |
2365 error ("Invalid depth in char-table"); | |
2366 depth = XINT (AREF (tmp, 0)); | |
2367 if (depth < 1 || depth > 3) | |
2368 error ("Invalid depth in char-table"); | |
89996
d13df8a735d7
(read1): Fix reading of a char-table.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2369 size = XVECTOR (tmp)->size - 2; |
88383 | 2370 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
|
2371 error ("Invalid size char-table"); |
91046 | 2372 XSETPVECTYPE (XVECTOR (tmp), PVEC_SUB_CHAR_TABLE); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2373 return tmp; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2374 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2375 invalid_syntax ("#^^", 3); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2376 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2377 invalid_syntax ("#^", 2); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2378 } |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2379 if (c == '&') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2380 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2381 Lisp_Object length; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2382 length = read1 (readcharfun, pch, first_in_list); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2383 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2384 if (c == '"') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2385 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2386 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
|
2387 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
|
2388 = ((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
|
2389 / BOOL_VECTOR_BITS_PER_CHAR); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2390 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2391 UNREAD (c); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2392 tmp = read1 (readcharfun, pch, first_in_list); |
88886 | 2393 if (STRING_MULTIBYTE (tmp) |
89483 | 2394 || (size_in_chars != SCHARS (tmp) |
88886 | 2395 /* We used to print 1 char too many |
2396 when the number of bits was a multiple of 8. | |
2397 Accept such input in case it came from an old | |
2398 version. */ | |
2399 && ! (XFASTINT (length) | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2400 == (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
|
2401 invalid_syntax ("#&...", 5); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2402 |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2403 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
|
2404 bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data, |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2405 size_in_chars); |
21935
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
2406 /* 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
|
2407 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
|
2408 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
|
2409 &= (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
|
2410 return val; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2411 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2412 invalid_syntax ("#&...", 5); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2413 } |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2414 if (c == '[') |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2415 { |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2416 /* 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
|
2417 build them using function calls. */ |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2418 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2419 tmp = read_vector (readcharfun, 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2420 return Fmake_byte_code (XVECTOR (tmp)->size, |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2421 XVECTOR (tmp)->contents); |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2422 } |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2423 if (c == '(') |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2424 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2425 Lisp_Object tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2426 struct gcpro gcpro1; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2427 int ch; |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2428 |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2429 /* 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
|
2430 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
|
2431 if (ch != 0 || !STRINGP (tmp)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2432 invalid_syntax ("#", 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2433 GCPRO1 (tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2434 /* Read the intervals and their properties. */ |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2435 while (1) |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2436 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2437 Lisp_Object beg, end, plist; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2438 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2439 beg = read1 (readcharfun, &ch, 0); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
2440 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
|
2441 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
|
2442 break; |
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2443 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2444 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
|
2445 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2446 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
|
2447 if (ch) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2448 invalid_syntax ("Invalid string property list", 0); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2449 Fset_text_properties (beg, end, plist, tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2450 } |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2451 UNGCPRO; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2452 return tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2453 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2454 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2455 /* #@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
|
2456 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
|
2457 and function definitions. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2458 if (c == '@') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2459 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2460 int i, nskip = 0; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2461 |
88886 | 2462 load_each_byte = 1; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2463 /* Read a decimal integer. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2464 while ((c = READCHAR) >= 0 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2465 && c >= '0' && c <= '9') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2466 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2467 nskip *= 10; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2468 nskip += c - '0'; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2469 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2470 if (c >= 0) |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2471 UNREAD (c); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2472 |
88886 | 2473 if (load_force_doc_strings |
2474 && (EQ (readcharfun, Qget_file_char) | |
2475 || EQ (readcharfun, Qget_emacs_mule_file_char))) | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2476 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2477 /* 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
|
2478 record the last string that we skipped, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2479 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
|
2480 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2481 /* But first exchange saved_doc_string |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2482 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
|
2483 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2484 char *temp = saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2485 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
|
2486 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
|
2487 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
|
2488 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2489 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
|
2490 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
|
2491 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
|
2492 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
|
2493 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2494 prev_saved_doc_string = temp; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2495 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
|
2496 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
|
2497 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
|
2498 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2499 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2500 if (saved_doc_string_size == 0) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2501 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2502 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
|
2503 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
|
2504 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2505 if (nskip > saved_doc_string_size) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2506 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2507 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
|
2508 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
|
2509 saved_doc_string_size); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2510 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2511 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
2512 saved_doc_string_position = file_tell (instream); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2513 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2514 /* Copy that many characters into saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2515 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2516 saved_doc_string[i] = c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2517 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2518 saved_doc_string_length = i; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2519 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2520 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2521 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2522 /* Skip that many characters. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2523 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2524 c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2525 } |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
2526 |
88886 | 2527 load_each_byte = 0; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2528 goto retry; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2529 } |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2530 if (c == '!') |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2531 { |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2532 /* #! 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
|
2533 Skip the first line. */ |
50138
75ed0f4a2f18
(read1): After #!, exit loop on eof.
Richard M. Stallman <rms@gnu.org>
parents:
49979
diff
changeset
|
2534 while (c != '\n' && c >= 0) |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2535 c = READCHAR; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2536 goto retry; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2537 } |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2538 if (c == '$') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2539 return Vload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2540 if (c == '\'') |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2541 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
|
2542 /* #: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
|
2543 if (c == ':') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2544 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2545 uninterned_symbol = 1; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2546 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2547 goto default_label; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2548 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2549 /* 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
|
2550 if (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2551 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2552 int n = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2553 Lisp_Object tem; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2554 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2555 /* Read a non-negative integer. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2556 while (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2557 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2558 n *= 10; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2559 n += c - '0'; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2560 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2561 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2562 /* #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
|
2563 if (c == '=') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2564 { |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2565 /* 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
|
2566 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2567 Lisp_Object cell; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2568 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2569 placeholder = Fcons(Qnil, Qnil); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2570 cell = Fcons (make_number (n), placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2571 read_objects = Fcons (cell, read_objects); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2572 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2573 /* Read the object itself. */ |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2574 tem = read0 (readcharfun); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2575 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2576 /* 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
|
2577 substitute_object_in_subtree (tem, placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2578 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2579 /* ...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
|
2580 Fsetcdr (cell, tem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2581 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2582 return tem; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2583 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2584 /* #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
|
2585 if (c == '#') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2586 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2587 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
|
2588 if (CONSP (tem)) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2589 return XCDR (tem); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2590 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2591 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2592 else if (c == 'r' || c == 'R') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2593 return read_integer (readcharfun, n); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2594 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2595 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2596 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2597 else if (c == 'x' || c == 'X') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2598 return read_integer (readcharfun, 16); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2599 else if (c == 'o' || c == 'O') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2600 return read_integer (readcharfun, 8); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2601 else if (c == 'b' || c == 'B') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2602 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
|
2603 |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2604 UNREAD (c); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2605 invalid_syntax ("#", 1); |
341 | 2606 |
2607 case ';': | |
2608 while ((c = READCHAR) >= 0 && c != '\n'); | |
2609 goto retry; | |
2610 | |
2611 case '\'': | |
2612 { | |
2613 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil)); | |
2614 } | |
2615 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2616 case '`': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2617 if (first_in_list) |
78612
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2618 { |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2619 Vold_style_backquotes = Qt; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2620 goto default_label; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2621 } |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2622 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2623 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2624 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2625 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2626 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2627 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2628 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2629 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2630 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
|
2631 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2632 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2633 case ',': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2634 if (new_backquote_flag) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2635 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2636 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
|
2637 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2638 int ch = READCHAR; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2639 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2640 if (ch == '@') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2641 comma_type = Qcomma_at; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2642 else if (ch == '.') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2643 comma_type = Qcomma_dot; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2644 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2645 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2646 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
|
2647 comma_type = Qcomma; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2648 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2649 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2650 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2651 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2652 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2653 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
|
2654 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2655 else |
78612
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2656 { |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2657 Vold_style_backquotes = Qt; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2658 goto default_label; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2659 } |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2660 |
341 | 2661 case '?': |
2662 { | |
88886 | 2663 int modifiers; |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2664 int next_char; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2665 int ok; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2666 |
341 | 2667 c = READCHAR; |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2668 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2669 end_of_file_error (); |
341 | 2670 |
49979
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2671 /* 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
|
2672 whitespace character is SPC or TAB. |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2673 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
|
2674 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
|
2675 if (c == ' ' || c == '\t') |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2676 return make_number (c); |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2677 |
341 | 2678 if (c == '\\') |
88886 | 2679 c = read_escape (readcharfun, 0); |
2680 modifiers = c & CHAR_MODIFIER_MASK; | |
2681 c &= ~CHAR_MODIFIER_MASK; | |
2682 if (CHAR_BYTE8_P (c)) | |
2683 c = CHAR_TO_BYTE8 (c); | |
2684 c |= modifiers; | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2685 |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2686 next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2687 if (next_char == '.') |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2688 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2689 /* 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
|
2690 int next_next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2691 UNREAD (next_next_char); |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2692 |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2693 ok = (next_next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2694 || (next_next_char < 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2695 && (index ("\"';([#?", next_next_char) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2696 || (!first_in_list && next_next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2697 || (new_backquote_flag && next_next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2698 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2699 else |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2700 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2701 ok = (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2702 || (next_char < 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2703 && (index ("\"';()[]#?", next_char) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2704 || (!first_in_list && next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2705 || (new_backquote_flag && next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2706 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2707 UNREAD (next_char); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2708 if (ok) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2709 return make_number (c); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2710 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2711 invalid_syntax ("?", 1); |
341 | 2712 } |
2713 | |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
2714 case '"': |
341 | 2715 { |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2716 char *p = read_buffer; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2717 char *end = read_buffer + read_buffer_size; |
341 | 2718 register int c; |
88383 | 2719 /* Nonzero if we saw an escape sequence specifying |
2720 a multibyte character. */ | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2721 int force_multibyte = 0; |
88383 | 2722 /* 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
|
2723 a single-byte character. */ |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2724 int force_singlebyte = 0; |
341 | 2725 int cancel = 0; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2726 int nchars = 0; |
341 | 2727 |
2728 while ((c = READCHAR) >= 0 | |
2729 && c != '\"') | |
2730 { | |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2731 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2732 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2733 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2734 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
|
2735 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2736 p = read_buffer + offset; |
341 | 2737 end = read_buffer + read_buffer_size; |
2738 } | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2739 |
341 | 2740 if (c == '\\') |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2741 { |
88383 | 2742 int modifiers; |
88886 | 2743 |
2744 c = read_escape (readcharfun, 1); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2745 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2746 /* 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
|
2747 if (c == -1) |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2748 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2749 if (p == read_buffer) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2750 cancel = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2751 continue; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2752 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2753 |
88383 | 2754 modifiers = c & CHAR_MODIFIER_MASK; |
2755 c = c & ~CHAR_MODIFIER_MASK; | |
2756 | |
88886 | 2757 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
|
2758 force_singlebyte = 1; |
88886 | 2759 else if (! ASCII_CHAR_P (c)) |
2760 force_multibyte = 1; | |
2761 else /* i.e. ASCII_CHAR_P (c) */ | |
88383 | 2762 { |
2763 /* Allow `\C- ' and `\C-?'. */ | |
2764 if (modifiers == CHAR_CTL) | |
2765 { | |
2766 if (c == ' ') | |
2767 c = 0, modifiers = 0; | |
2768 else if (c == '?') | |
2769 c = 127, modifiers = 0; | |
2770 } | |
2771 if (modifiers & CHAR_SHIFT) | |
2772 { | |
2773 /* Shift modifier is valid only with [A-Za-z]. */ | |
2774 if (c >= 'A' && c <= 'Z') | |
2775 modifiers &= ~CHAR_SHIFT; | |
2776 else if (c >= 'a' && c <= 'z') | |
2777 c -= ('a' - 'A'), modifiers &= ~CHAR_SHIFT; | |
2778 } | |
2779 | |
2780 if (modifiers & CHAR_META) | |
2781 { | |
2782 /* Move the meta bit to the right place for a | |
2783 string. */ | |
2784 modifiers &= ~CHAR_META; | |
2785 c = BYTE8_TO_CHAR (c | 0x80); | |
2786 force_singlebyte = 1; | |
2787 } | |
2788 } | |
2789 | |
2790 /* Any modifiers remaining are invalid. */ | |
2791 if (modifiers) | |
2792 error ("Invalid modifier in string"); | |
2793 p += CHAR_STRING (c, (unsigned char *) p); | |
341 | 2794 } |
88886 | 2795 else |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
2796 { |
88383 | 2797 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
|
2798 if (CHAR_BYTE8_P (c)) |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2799 force_singlebyte = 1; |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2800 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
|
2801 force_multibyte = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2802 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2803 nchars++; |
341 | 2804 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2805 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2806 if (c < 0) |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2807 end_of_file_error (); |
341 | 2808 |
2809 /* If purifying, and string starts with \ newline, | |
2810 return zero instead. This is for doc strings | |
604 | 2811 that we are really going to find in etc/DOC.nn.nn */ |
485 | 2812 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) |
341 | 2813 return make_number (0); |
2814 | |
88383 | 2815 if (force_multibyte) |
2816 /* 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
|
2817 ; |
88383 | 2818 else if (force_singlebyte) |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2819 { |
88383 | 2820 nchars = str_as_unibyte (read_buffer, p - read_buffer); |
2821 p = read_buffer + nchars; | |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2822 } |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2823 else |
88383 | 2824 /* 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
|
2825 ; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2826 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2827 /* 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
|
2828 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
|
2829 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
|
2830 READCHAR *does* read multibyte characters from buffers. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2831 /* readchar_count -= (p - read_buffer) - nchars; */ |
341 | 2832 if (read_pure) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2833 return make_pure_string (read_buffer, nchars, p - read_buffer, |
88383 | 2834 (force_multibyte |
2835 || (p - read_buffer != nchars))); | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2836 return make_specified_string (read_buffer, nchars, p - read_buffer, |
88383 | 2837 (force_multibyte |
2838 || (p - read_buffer != nchars))); | |
341 | 2839 } |
2840 | |
762 | 2841 case '.': |
2842 { | |
2843 int next_char = READCHAR; | |
2844 UNREAD (next_char); | |
2845 | |
28746
42f2ded9d9db
(read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents:
28733
diff
changeset
|
2846 if (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2847 || (next_char < 0200 |
58093
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2848 && (index ("\"';([#?", next_char) |
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2849 || (!first_in_list && next_char == '`') |
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2850 || (new_backquote_flag && next_char == ',')))) |
762 | 2851 { |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2852 *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
|
2853 return Qnil; |
762 | 2854 } |
2855 | |
2856 /* Otherwise, we fall through! Note that the atom-reading loop | |
2857 below will now loop at least once, assuring that we will not | |
2858 try to UNREAD two characters in a row. */ | |
2859 } | |
341 | 2860 default: |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2861 default_label: |
341 | 2862 if (c <= 040) goto retry; |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2863 if (c == 0x8a0) /* NBSP */ |
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2864 goto retry; |
341 | 2865 { |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2866 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
|
2867 int quoted = 0; |
341 | 2868 |
2869 { | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2870 char *end = read_buffer + read_buffer_size; |
341 | 2871 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2872 while (c > 040 |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2873 && c != 0x8a0 /* NBSP */ |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2874 && (c >= 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2875 || (!index ("\"';()[]#", c) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2876 && !(!first_in_list && c == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2877 && !(new_backquote_flag && c == ',')))) |
341 | 2878 { |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2879 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2880 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2881 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2882 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
|
2883 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2884 p = read_buffer + offset; |
341 | 2885 end = read_buffer + read_buffer_size; |
2886 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2887 |
341 | 2888 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
|
2889 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2890 c = READCHAR; |
34604
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2891 if (c == -1) |
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2892 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
|
2893 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
|
2894 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2895 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2896 if (multibyte) |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2897 p += CHAR_STRING (c, p); |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2898 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2899 *p++ = c; |
341 | 2900 c = READCHAR; |
2901 } | |
2902 | |
2903 if (p == end) | |
2904 { | |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2905 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2906 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
|
2907 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2908 p = read_buffer + offset; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2909 end = read_buffer + read_buffer_size; |
341 | 2910 } |
2911 *p = 0; | |
2912 if (c >= 0) | |
2913 UNREAD (c); | |
2914 } | |
2915 | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2916 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
|
2917 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2918 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
|
2919 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
|
2920 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
|
2921 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
|
2922 /* 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
|
2923 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
|
2924 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2925 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
|
2926 /* 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
|
2927 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
|
2928 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
|
2929 /* 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
|
2930 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2931 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
|
2932 p1[-1] = '\0'; |
89070 | 2933 /* Fixme: if we have strtol, use that, and check |
2934 for overflow. */ | |
11699
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2935 if (sizeof (int) == sizeof (EMACS_INT)) |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2936 XSETINT (val, atoi (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2937 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
|
2938 XSETINT (val, atol (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2939 else |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2940 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
|
2941 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
|
2942 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2943 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2944 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
|
2945 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2946 /* 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
|
2947 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
|
2948 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
|
2949 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
|
2950 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2951 double value; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2952 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2953 /* 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
|
2954 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
|
2955 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
|
2956 drops the sign. */ |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2957 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
|
2958 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2959 /* 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
|
2960 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
|
2961 switch (p[-1]) |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2962 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2963 case 'F': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2964 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
|
2965 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2966 case 'N': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2967 value = zero / zero; |
63755
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2968 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2969 /* 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
|
2970 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2971 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2972 int i; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2973 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
|
2974 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2975 u_data.d = value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2976 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
|
2977 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
|
2978 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
|
2979 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2980 value = - value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2981 break; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2982 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2983 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2984 /* 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
|
2985 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2986 default: |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2987 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
|
2988 break; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2989 } |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2990 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2991 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
|
2992 } |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2993 } |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2994 { |
91185
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
2995 Lisp_Object name, result; |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
2996 EMACS_INT nbytes = p - read_buffer; |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
2997 EMACS_INT nchars |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
2998 = (multibyte ? multibyte_chars_in_text (read_buffer, nbytes) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
2999 : nbytes); |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3000 |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3001 if (uninterned_symbol && ! NILP (Vpurify_flag)) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3002 name = make_pure_string (read_buffer, nchars, nbytes, multibyte); |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3003 else |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3004 name = make_specified_string (read_buffer, nchars, nbytes,multibyte); |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3005 result = (uninterned_symbol ? Fmake_symbol (name) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3006 : Fintern (name, Qnil)); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
3007 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3008 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3009 || EQ (Vread_with_symbol_positions, readcharfun)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3010 Vread_symbol_positions_list = |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3011 /* 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
|
3012 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
|
3013 deal, though. */ |
45747
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3014 Fcons (Fcons (result, |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3015 make_number (readchar_count |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3016 - XFASTINT (Flength (Fsymbol_name (result))))), |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3017 Vread_symbol_positions_list); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3018 return result; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3019 } |
341 | 3020 } |
3021 } | |
3022 } | |
3023 | |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3024 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3025 /* 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
|
3026 static Lisp_Object seen_list; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3027 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3028 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3029 substitute_object_in_subtree (object, placeholder) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3030 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3031 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3032 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3033 Lisp_Object check_object; |
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 /* 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
|
3036 seen_list = Qnil; |
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 /* Make all the substitutions. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3039 check_object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3040 = substitute_object_recurse (object, placeholder, object); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3041 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3042 /* 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
|
3043 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3044 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3045 /* 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
|
3046 original. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3047 if (!EQ (check_object, object)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3048 error ("Unexpected mutation error in reader"); |
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 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3051 /* Feval doesn't get called from here, so no gc protection is needed. */ |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3052 #define SUBSTITUTE(get_val, set_val) \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3053 do { \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3054 Lisp_Object old_value = get_val; \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3055 Lisp_Object true_value \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3056 = substitute_object_recurse (object, placeholder, \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3057 old_value); \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3058 \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3059 if (!EQ (old_value, true_value)) \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3060 { \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3061 set_val; \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3062 } \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3063 } while (0) |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3064 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3065 static Lisp_Object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3066 substitute_object_recurse (object, placeholder, subtree) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3067 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3068 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3069 Lisp_Object subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3070 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3071 /* 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
|
3072 if (EQ (placeholder, subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3073 return object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3074 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3075 /* 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
|
3076 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
|
3077 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3078 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3079 /* 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
|
3080 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
|
3081 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
|
3082 read_objects. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3083 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
|
3084 seen_list = Fcons (subtree, seen_list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3085 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3086 /* Recurse according to subtree's type. |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3087 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
|
3088 switch (XTYPE (subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3089 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3090 case Lisp_Vectorlike: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3091 { |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3092 int i, length = 0; |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3093 if (BOOL_VECTOR_P (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3094 return subtree; /* No sub-objects anyway. */ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3095 else if (CHAR_TABLE_P (subtree) || SUB_CHAR_TABLE_P (subtree) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3096 || COMPILEDP (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3097 length = ASIZE (subtree) & PSEUDOVECTOR_SIZE_MASK; |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3098 else if (VECTORP (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3099 length = ASIZE (subtree); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3100 else |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3101 /* An unknown pseudovector may contain non-Lisp fields, so we |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3102 can't just blindly traverse all its fields. We used to call |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95860
diff
changeset
|
3103 `Flength' which signaled `sequencep', so I just preserved this |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3104 behavior. */ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3105 wrong_type_argument (Qsequencep, subtree); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3106 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3107 for (i = 0; i < length; i++) |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3108 SUBSTITUTE (AREF (subtree, i), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3109 ASET (subtree, i, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3110 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3111 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3112 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3113 case Lisp_Cons: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3114 { |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3115 SUBSTITUTE (XCAR (subtree), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3116 XSETCAR (subtree, true_value)); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3117 SUBSTITUTE (XCDR (subtree), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3118 XSETCDR (subtree, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3119 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3120 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3121 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3122 case Lisp_String: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3123 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3124 /* 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
|
3125 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
|
3126 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3127 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
|
3128 Lisp_Object arg = Fcons (object, placeholder); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3129 |
39857
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3130 traverse_intervals_noorder (root_interval, |
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3131 &substitute_in_interval, arg); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3132 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3133 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3134 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3135 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3136 /* 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
|
3137 default: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3138 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3139 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3140 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3141 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3142 /* Helper function for substitute_object_recurse. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3143 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3144 substitute_in_interval (interval, arg) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3145 INTERVAL interval; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3146 Lisp_Object arg; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3147 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3148 Lisp_Object object = Fcar (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3149 Lisp_Object placeholder = Fcdr (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3150 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3151 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
|
3152 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3153 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3154 |
341 | 3155 #define LEAD_INT 1 |
3156 #define DOT_CHAR 2 | |
3157 #define TRAIL_INT 4 | |
3158 #define E_CHAR 8 | |
3159 #define EXP_INT 16 | |
3160 | |
3161 int | |
3162 isfloat_string (cp) | |
3163 register char *cp; | |
3164 { | |
21799 | 3165 register int state; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3166 |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3167 char *start = cp; |
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3168 |
341 | 3169 state = 0; |
3170 if (*cp == '+' || *cp == '-') | |
3171 cp++; | |
3172 | |
9871 | 3173 if (*cp >= '0' && *cp <= '9') |
341 | 3174 { |
3175 state |= LEAD_INT; | |
9871 | 3176 while (*cp >= '0' && *cp <= '9') |
3177 cp++; | |
341 | 3178 } |
3179 if (*cp == '.') | |
3180 { | |
3181 state |= DOT_CHAR; | |
3182 cp++; | |
3183 } | |
9871 | 3184 if (*cp >= '0' && *cp <= '9') |
341 | 3185 { |
3186 state |= TRAIL_INT; | |
9871 | 3187 while (*cp >= '0' && *cp <= '9') |
341 | 3188 cp++; |
3189 } | |
16342
b91af71f45f1
(isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents:
16228
diff
changeset
|
3190 if (*cp == 'e' || *cp == 'E') |
341 | 3191 { |
3192 state |= E_CHAR; | |
3193 cp++; | |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3194 if (*cp == '+' || *cp == '-') |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3195 cp++; |
341 | 3196 } |
3197 | |
9871 | 3198 if (*cp >= '0' && *cp <= '9') |
341 | 3199 { |
3200 state |= EXP_INT; | |
9871 | 3201 while (*cp >= '0' && *cp <= '9') |
341 | 3202 cp++; |
3203 } | |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3204 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
|
3205 ; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3206 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
|
3207 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3208 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3209 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3210 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3211 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
|
3212 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3213 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3214 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3215 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3216 |
11172
e1ca77e22c12
(isfloat_string): Permit trailing space.
Richard M. Stallman <rms@gnu.org>
parents:
11079
diff
changeset
|
3217 return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) |
341 | 3218 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) |
826 | 3219 || state == (DOT_CHAR|TRAIL_INT) |
341 | 3220 || state == (LEAD_INT|E_CHAR|EXP_INT) |
826 | 3221 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT) |
3222 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT))); | |
341 | 3223 } |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27645
diff
changeset
|
3224 |
341 | 3225 |
3226 static Lisp_Object | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3227 read_vector (readcharfun, bytecodeflag) |
341 | 3228 Lisp_Object readcharfun; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3229 int bytecodeflag; |
341 | 3230 { |
3231 register int i; | |
3232 register int size; | |
3233 register Lisp_Object *ptr; | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3234 register Lisp_Object tem, item, vector; |
341 | 3235 register struct Lisp_Cons *otem; |
3236 Lisp_Object len; | |
3237 | |
3238 tem = read_list (1, readcharfun); | |
3239 len = Flength (tem); | |
3240 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil)); | |
3241 | |
3242 size = XVECTOR (vector)->size; | |
3243 ptr = XVECTOR (vector)->contents; | |
3244 for (i = 0; i < size; i++) | |
3245 { | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3246 item = Fcar (tem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3247 /* 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
|
3248 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
|
3249 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
|
3250 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
|
3251 if (bytecodeflag && load_force_doc_strings) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3252 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3253 if (i == COMPILED_BYTECODE) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3254 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3255 if (!STRINGP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3256 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3257 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3258 /* 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
|
3259 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
|
3260 constants slot is nil). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3261 ptr[COMPILED_CONSTANTS] = item; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3262 item = Qnil; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3263 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3264 else if (i == COMPILED_CONSTANTS) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3265 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3266 Lisp_Object bytestr = ptr[COMPILED_CONSTANTS]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3267 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3268 if (NILP (item)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3269 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3270 /* 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
|
3271 but without generating extra garbage and |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3272 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
|
3273 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
|
3274 STRING_SET_UNIBYTE (bytestr); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3275 |
88886 | 3276 item = Fread (Fcons (bytestr, readcharfun)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3277 if (!CONSP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3278 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3279 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3280 otem = XCONS (item); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3281 bytestr = XCAR (item); |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3282 item = XCDR (item); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3283 free_cons (otem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3284 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3285 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3286 /* Now handle the bytecode slot. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3287 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
|
3288 } |
88886 | 3289 else if (i == COMPILED_DOC_STRING |
3290 && STRINGP (item) | |
3291 && ! STRING_MULTIBYTE (item)) | |
3292 { | |
3293 if (EQ (readcharfun, Qget_emacs_mule_file_char)) | |
3294 item = Fdecode_coding_string (item, Qemacs_mule, Qnil, Qnil); | |
3295 else | |
3296 item = Fstring_as_multibyte (item); | |
3297 } | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3298 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3299 ptr[i] = read_pure ? Fpurecopy (item) : item; |
341 | 3300 otem = XCONS (tem); |
3301 tem = Fcdr (tem); | |
3302 free_cons (otem); | |
3303 } | |
3304 return vector; | |
3305 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3306 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
3307 /* 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
|
3308 FLAG = -1 means check for starting with defun |
341 | 3309 and make structure pure. */ |
3310 | |
3311 static Lisp_Object | |
3312 read_list (flag, readcharfun) | |
3313 int flag; | |
3314 register Lisp_Object readcharfun; | |
3315 { | |
3316 /* -1 means check next element for defun, | |
3317 0 means don't check, | |
3318 1 means already checked and found defun. */ | |
3319 int defunflag = flag < 0 ? -1 : 0; | |
3320 Lisp_Object val, tail; | |
3321 register Lisp_Object elt, tem; | |
3322 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
|
3323 /* 0 is the normal case. |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3324 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
|
3325 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
|
3326 int doc_reference = 0; |
341 | 3327 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3328 /* 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
|
3329 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
|
3330 |
341 | 3331 val = Qnil; |
3332 tail = Qnil; | |
3333 | |
3334 while (1) | |
3335 { | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3336 int ch; |
341 | 3337 GCPRO2 (val, tail); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3338 elt = read1 (readcharfun, &ch, first_in_list); |
341 | 3339 UNGCPRO; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3340 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3341 first_in_list = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3342 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3343 /* 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
|
3344 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
|
3345 && ! 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
|
3346 && !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
|
3347 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3348 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
|
3349 /* 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
|
3350 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
|
3351 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
|
3352 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
|
3353 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
|
3354 else |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3355 /* 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
|
3356 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
|
3357 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
|
3358 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
|
3359 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
|
3360 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
|
3361 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
|
3362 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3363 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
|
3364 && ! NILP (elt) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3365 && load_force_doc_strings) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3366 doc_reference = 2; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3367 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3368 if (ch) |
341 | 3369 { |
3370 if (flag > 0) | |
3371 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3372 if (ch == ']') |
341 | 3373 return val; |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3374 invalid_syntax (") or . in a vector", 18); |
341 | 3375 } |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3376 if (ch == ')') |
341 | 3377 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
|
3378 if (ch == '.') |
341 | 3379 { |
3380 GCPRO2 (val, tail); | |
485 | 3381 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3382 XSETCDR (tail, read0 (readcharfun)); |
341 | 3383 else |
3384 val = read0 (readcharfun); | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3385 read1 (readcharfun, &ch, 0); |
341 | 3386 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
|
3387 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
|
3388 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3389 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
|
3390 return make_number (0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3391 if (doc_reference == 2) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3392 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3393 /* Get a doc string from the file we are loading. |
88886 | 3394 If it's in saved_doc_string, get it from there. |
3395 | |
3396 Here, we don't know if the string is a | |
3397 bytecode string or a doc string. As a | |
3398 bytecode string must be unibyte, we always | |
3399 return a unibyte string. If it is actually a | |
3400 doc string, caller must make it | |
3401 multibyte. */ | |
89483 | 3402 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3403 int pos = XINT (XCDR (val)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3404 /* Position is negative for user variables. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3405 if (pos < 0) pos = -pos; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3406 if (pos >= saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3407 && pos < (saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3408 + saved_doc_string_length)) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3409 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3410 int start = pos - saved_doc_string_position; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3411 int from, to; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3412 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3413 /* Process quoting with ^A, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3414 and find the end of the string, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3415 which is marked with ^_ (037). */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3416 for (from = start, to = start; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3417 saved_doc_string[from] != 037;) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3418 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3419 int c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3420 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3421 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3422 c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3423 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3424 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3425 else if (c == '0') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3426 saved_doc_string[to++] = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3427 else if (c == '_') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3428 saved_doc_string[to++] = 037; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3429 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3430 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3431 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3432 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3433 |
88886 | 3434 return make_unibyte_string (saved_doc_string + start, |
3435 to - start); | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3436 } |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3437 /* 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
|
3438 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
|
3439 && pos < (prev_saved_doc_string_position |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3440 + prev_saved_doc_string_length)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3441 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3442 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
|
3443 int from, to; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3444 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3445 /* Process quoting with ^A, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3446 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
|
3447 which is marked with ^_ (037). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3448 for (from = start, to = start; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3449 prev_saved_doc_string[from] != 037;) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3450 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3451 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
|
3452 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3453 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3454 c = prev_saved_doc_string[from++]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3455 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3456 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3457 else if (c == '0') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3458 prev_saved_doc_string[to++] = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3459 else if (c == '_') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3460 prev_saved_doc_string[to++] = 037; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3461 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3462 else |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3463 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3464 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3465 |
88886 | 3466 return make_unibyte_string (prev_saved_doc_string |
3467 + start, | |
3468 to - start); | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3469 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3470 else |
88886 | 3471 return get_doc_string (val, 1, 0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3472 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3473 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3474 return val; |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3475 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3476 invalid_syntax (". in wrong context", 18); |
341 | 3477 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3478 invalid_syntax ("] in a list", 11); |
341 | 3479 } |
3480 tem = (read_pure && flag <= 0 | |
3481 ? pure_cons (elt, Qnil) | |
3482 : Fcons (elt, Qnil)); | |
485 | 3483 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3484 XSETCDR (tail, tem); |
341 | 3485 else |
3486 val = tem; | |
3487 tail = tem; | |
3488 if (defunflag < 0) | |
3489 defunflag = EQ (elt, Qdefun); | |
3490 else if (defunflag > 0) | |
3491 read_pure = 1; | |
3492 } | |
3493 } | |
3494 | |
3495 Lisp_Object Vobarray; | |
3496 Lisp_Object initial_obarray; | |
3497 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3498 /* 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
|
3499 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3500 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
|
3501 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3502 static int hash_string (); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3503 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3504 /* 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
|
3505 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
|
3506 |
341 | 3507 Lisp_Object |
3508 check_obarray (obarray) | |
3509 Lisp_Object obarray; | |
3510 { | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
3511 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3512 { |
3513 /* If Vobarray is now invalid, force it to be valid. */ | |
3514 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
|
3515 wrong_type_argument (Qvectorp, obarray); |
341 | 3516 } |
3517 return obarray; | |
3518 } | |
3519 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3520 /* 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
|
3521 interned in the current obarray. */ |
341 | 3522 |
3523 Lisp_Object | |
3524 intern (str) | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3525 const char *str; |
341 | 3526 { |
3527 Lisp_Object tem; | |
3528 int len = strlen (str); | |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3529 Lisp_Object obarray; |
341 | 3530 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3531 obarray = Vobarray; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3532 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3533 obarray = check_obarray (obarray); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3534 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
|
3535 if (SYMBOLP (tem)) |
341 | 3536 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
|
3537 return Fintern (make_string (str, len), obarray); |
341 | 3538 } |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3539 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3540 /* 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
|
3541 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3542 Lisp_Object |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3543 make_symbol (str) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3544 char *str; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3545 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3546 int len = strlen (str); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3547 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3548 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
|
3549 ? 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
|
3550 : make_string (str, len))); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3551 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3552 |
341 | 3553 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
|
3554 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
|
3555 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
|
3556 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
|
3557 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
|
3558 (string, obarray) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3559 Lisp_Object string, obarray; |
341 | 3560 { |
3561 register Lisp_Object tem, sym, *ptr; | |
3562 | |
485 | 3563 if (NILP (obarray)) obarray = Vobarray; |
341 | 3564 obarray = check_obarray (obarray); |
3565 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3566 CHECK_STRING (string); |
341 | 3567 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3568 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
|
3569 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3570 SBYTES (string)); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3571 if (!INTEGERP (tem)) |
341 | 3572 return tem; |
3573 | |
485 | 3574 if (!NILP (Vpurify_flag)) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3575 string = Fpurecopy (string); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3576 sym = Fmake_symbol (string); |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3577 |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3578 if (EQ (obarray, initial_obarray)) |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3579 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
|
3580 else |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3581 XSYMBOL (sym)->interned = SYMBOL_INTERNED; |
341 | 3582 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3583 if ((SREF (string, 0) == ':') |
21982
456f95c03285
(Fintern): Properly compare lisp objects.
Richard M. Stallman <rms@gnu.org>
parents:
21936
diff
changeset
|
3584 && EQ (obarray, initial_obarray)) |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3585 { |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3586 XSYMBOL (sym)->constant = 1; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3587 XSYMBOL (sym)->value = sym; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3588 } |
17918
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
3589 |
341 | 3590 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
|
3591 if (SYMBOLP (*ptr)) |
341 | 3592 XSYMBOL (sym)->next = XSYMBOL (*ptr); |
3593 else | |
3594 XSYMBOL (sym)->next = 0; | |
3595 *ptr = sym; | |
3596 return sym; | |
3597 } | |
3598 | |
3599 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
|
3600 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
|
3601 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
|
3602 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
|
3603 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
|
3604 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
|
3605 (name, obarray) |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3606 Lisp_Object name, obarray; |
341 | 3607 { |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3608 register Lisp_Object tem, string; |
341 | 3609 |
485 | 3610 if (NILP (obarray)) obarray = Vobarray; |
341 | 3611 obarray = check_obarray (obarray); |
3612 | |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3613 if (!SYMBOLP (name)) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3614 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3615 CHECK_STRING (name); |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3616 string = name; |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3617 } |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3618 else |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3619 string = SYMBOL_NAME (name); |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3620 |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3621 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
|
3622 if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem))) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3623 return Qnil; |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3624 else |
341 | 3625 return tem; |
3626 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3627 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3628 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
|
3629 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
|
3630 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
|
3631 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
|
3632 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
|
3633 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
|
3634 (name, obarray) |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3635 Lisp_Object name, obarray; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3636 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3637 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
|
3638 int hash; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3639 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3640 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
|
3641 obarray = check_obarray (obarray); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3642 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3643 if (SYMBOLP (name)) |
45406
6f19e244af49
* lread.c (Fintern_soft, oblookup): Use SYMBOL_NAME and XSTRING
Ken Raeburn <raeburn@raeburn.org>
parents:
45001
diff
changeset
|
3644 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
|
3645 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3646 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3647 CHECK_STRING (name); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3648 string = name; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3649 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3650 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3651 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
|
3652 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3653 SBYTES (string)); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3654 if (INTEGERP (tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3655 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3656 /* 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
|
3657 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
|
3658 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3659 |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3660 XSYMBOL (tem)->interned = SYMBOL_UNINTERNED; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3661 XSYMBOL (tem)->constant = 0; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3662 XSYMBOL (tem)->indirect_variable = 0; |
20773
6c655dc99321
(Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
3663 |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3664 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
|
3665 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3666 if (EQ (XVECTOR (obarray)->contents[hash], tem)) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3667 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3668 if (XSYMBOL (tem)->next) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3669 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3670 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3671 XSETINT (XVECTOR (obarray)->contents[hash], 0); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3672 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3673 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3674 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3675 Lisp_Object tail, following; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3676 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3677 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
|
3678 XSYMBOL (tail)->next; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3679 tail = following) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3680 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3681 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
|
3682 if (EQ (following, tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3683 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3684 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
|
3685 break; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3686 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3687 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3688 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3689 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3690 return Qt; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3691 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3692 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3693 /* 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
|
3694 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
|
3695 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
|
3696 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3697 Also store the bucket number in oblookup_last_bucket_number. */ |
341 | 3698 |
3699 Lisp_Object | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3700 oblookup (obarray, ptr, size, size_byte) |
341 | 3701 Lisp_Object obarray; |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3702 register const char *ptr; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3703 int size, size_byte; |
341 | 3704 { |
8828 | 3705 int hash; |
3706 int obsize; | |
341 | 3707 register Lisp_Object tail; |
3708 Lisp_Object bucket, tem; | |
3709 | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3710 if (!VECTORP (obarray) |
5243 | 3711 || (obsize = XVECTOR (obarray)->size) == 0) |
341 | 3712 { |
3713 obarray = check_obarray (obarray); | |
3714 obsize = XVECTOR (obarray)->size; | |
3715 } | |
13455
4f5a9ce67782
(oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
3716 /* 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
|
3717 obsize &= ~ARRAY_MARK_FLAG; |
97142 | 3718 hash = hash_string (ptr, size_byte) % obsize; |
341 | 3719 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
|
3720 oblookup_last_bucket_number = hash; |
58449
377948a6af9a
(oblookup): Don't use XFASTINT blindly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58093
diff
changeset
|
3721 if (EQ (bucket, make_number (0))) |
341 | 3722 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3723 else if (!SYMBOLP (bucket)) |
341 | 3724 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
|
3725 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3726 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next)) |
341 | 3727 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3728 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
|
3729 && 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
|
3730 && !bcmp (SDATA (SYMBOL_NAME (tail)), ptr, size_byte)) |
341 | 3731 return tail; |
3732 else if (XSYMBOL (tail)->next == 0) | |
3733 break; | |
3734 } | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3735 XSETINT (tem, hash); |
341 | 3736 return tem; |
3737 } | |
3738 | |
3739 static int | |
3740 hash_string (ptr, len) | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3741 const unsigned char *ptr; |
341 | 3742 int len; |
3743 { | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3744 register const unsigned char *p = ptr; |
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3745 register const unsigned char *end = p + len; |
341 | 3746 register unsigned char c; |
3747 register int hash = 0; | |
3748 | |
3749 while (p != end) | |
3750 { | |
3751 c = *p++; | |
3752 if (c >= 0140) c -= 40; | |
3753 hash = ((hash<<3) + (hash>>28) + c); | |
3754 } | |
3755 return hash & 07777777777; | |
3756 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3757 |
341 | 3758 void |
3759 map_obarray (obarray, fn, arg) | |
3760 Lisp_Object obarray; | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3761 void (*fn) P_ ((Lisp_Object, Lisp_Object)); |
341 | 3762 Lisp_Object arg; |
3763 { | |
3764 register int i; | |
3765 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
|
3766 CHECK_VECTOR (obarray); |
341 | 3767 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--) |
3768 { | |
3769 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
|
3770 if (SYMBOLP (tail)) |
341 | 3771 while (1) |
3772 { | |
3773 (*fn) (tail, arg); | |
3774 if (XSYMBOL (tail)->next == 0) | |
3775 break; | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3776 XSETSYMBOL (tail, XSYMBOL (tail)->next); |
341 | 3777 } |
3778 } | |
3779 } | |
3780 | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3781 void |
341 | 3782 mapatoms_1 (sym, function) |
3783 Lisp_Object sym, function; | |
3784 { | |
3785 call1 (function, sym); | |
3786 } | |
3787 | |
3788 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
|
3789 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
|
3790 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
|
3791 (function, obarray) |
341 | 3792 Lisp_Object function, obarray; |
3793 { | |
485 | 3794 if (NILP (obarray)) obarray = Vobarray; |
341 | 3795 obarray = check_obarray (obarray); |
3796 | |
3797 map_obarray (obarray, mapatoms_1, function); | |
3798 return Qnil; | |
3799 } | |
3800 | |
5117
951396781a0e
(OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents:
5017
diff
changeset
|
3801 #define OBARRAY_SIZE 1511 |
341 | 3802 |
3803 void | |
3804 init_obarray () | |
3805 { | |
3806 Lisp_Object oblength; | |
3807 int hash; | |
3808 Lisp_Object *tem; | |
3809 | |
9313
ed68c3822e4b
(read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9274
diff
changeset
|
3810 XSETFASTINT (oblength, OBARRAY_SIZE); |
341 | 3811 |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3812 Qnil = Fmake_symbol (make_pure_string ("nil", 3, 3, 0)); |
341 | 3813 Vobarray = Fmake_vector (oblength, make_number (0)); |
3814 initial_obarray = Vobarray; | |
3815 staticpro (&initial_obarray); | |
3816 /* Intern nil in the obarray */ | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3817 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
|
3818 XSYMBOL (Qnil)->constant = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3819 |
341 | 3820 /* These locals are to kludge around a pyramid compiler bug. */ |
3821 hash = hash_string ("nil", 3); | |
3822 /* Separate statement here to avoid VAXC bug. */ | |
3823 hash %= OBARRAY_SIZE; | |
3824 tem = &XVECTOR (Vobarray)->contents[hash]; | |
3825 *tem = Qnil; | |
3826 | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3827 Qunbound = Fmake_symbol (make_pure_string ("unbound", 7, 7, 0)); |
341 | 3828 XSYMBOL (Qnil)->function = Qunbound; |
3829 XSYMBOL (Qunbound)->value = Qunbound; | |
3830 XSYMBOL (Qunbound)->function = Qunbound; | |
3831 | |
3832 Qt = intern ("t"); | |
3833 XSYMBOL (Qnil)->value = Qnil; | |
3834 XSYMBOL (Qnil)->plist = Qnil; | |
3835 XSYMBOL (Qt)->value = Qt; | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3836 XSYMBOL (Qt)->constant = 1; |
341 | 3837 |
3838 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */ | |
3839 Vpurify_flag = Qt; | |
3840 | |
3841 Qvariable_documentation = intern ("variable-documentation"); | |
16228
fa7a56c543df
(init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents:
16165
diff
changeset
|
3842 staticpro (&Qvariable_documentation); |
341 | 3843 |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
3844 read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH; |
27852
98f55bbdbbad
(Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents:
27763
diff
changeset
|
3845 read_buffer = (char *) xmalloc (read_buffer_size); |
341 | 3846 } |
3847 | |
3848 void | |
3849 defsubr (sname) | |
3850 struct Lisp_Subr *sname; | |
3851 { | |
3852 Lisp_Object sym; | |
3853 sym = intern (sname->symbol_name); | |
85015
695c195058e7
(defsubr): Use XSETPVECTYPE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85011
diff
changeset
|
3854 XSETPVECTYPE (sname, PVEC_SUBR); |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3855 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3856 } |
3857 | |
3858 #ifdef NOTDEF /* use fset in subr.el now */ | |
3859 void | |
3860 defalias (sname, string) | |
3861 struct Lisp_Subr *sname; | |
3862 char *string; | |
3863 { | |
3864 Lisp_Object sym; | |
3865 sym = intern (string); | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3866 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3867 } |
3868 #endif /* NOTDEF */ | |
3869 | |
3870 /* Define an "integer variable"; a symbol whose value is forwarded | |
85127
b98ea218eb70
Fix comment; indent-tabs-mode was a bad example,
Juanma Barranquero <lekktu@gmail.com>
parents:
85015
diff
changeset
|
3871 to a C variable of type int. Sample call: |
b98ea218eb70
Fix comment; indent-tabs-mode was a bad example,
Juanma Barranquero <lekktu@gmail.com>
parents:
85015
diff
changeset
|
3872 DEFVAR_INT ("emacs-priority", &emacs_priority, "Documentation"); */ |
341 | 3873 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3874 defvar_int (namestring, address) |
341 | 3875 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
|
3876 EMACS_INT *address; |
341 | 3877 { |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3878 Lisp_Object sym, val; |
341 | 3879 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
|
3880 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3881 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
|
3882 XINTFWD (val)->intvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3883 SET_SYMBOL_VALUE (sym, val); |
341 | 3884 } |
3885 | |
42206 | 3886 /* Similar but define a variable whose value is t if address contains 1, |
85127
b98ea218eb70
Fix comment; indent-tabs-mode was a bad example,
Juanma Barranquero <lekktu@gmail.com>
parents:
85015
diff
changeset
|
3887 nil if address contains 0. */ |
341 | 3888 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3889 defvar_bool (namestring, address) |
341 | 3890 char *namestring; |
3891 int *address; | |
3892 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3893 Lisp_Object sym, val; |
341 | 3894 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
|
3895 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3896 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
|
3897 XBOOLFWD (val)->boolvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3898 SET_SYMBOL_VALUE (sym, val); |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
3899 Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars); |
341 | 3900 } |
3901 | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3902 /* 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
|
3903 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
|
3904 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
|
3905 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
|
3906 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
|
3907 void |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3908 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
|
3909 char *namestring; |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3910 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
|
3911 { |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3912 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
|
3913 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
|
3914 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3915 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
|
3916 XOBJFWD (val)->objvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3917 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
|
3918 } |
341 | 3919 |
3920 void | |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3921 defvar_lisp (namestring, address) |
341 | 3922 char *namestring; |
3923 Lisp_Object *address; | |
3924 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3925 defvar_lisp_nopro (namestring, address); |
341 | 3926 staticpro (address); |
3927 } | |
3928 | |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3929 /* 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
|
3930 at a particular offset in the current kboard object. */ |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3931 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3932 void |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
3933 defvar_kboard (namestring, offset) |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3934 char *namestring; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3935 int offset; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3936 { |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3937 Lisp_Object sym, val; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3938 sym = intern (namestring); |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3939 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3940 XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd; |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
3941 XKBOARD_OBJFWD (val)->offset = offset; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3942 SET_SYMBOL_VALUE (sym, val); |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3943 } |
341 | 3944 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3945 /* 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
|
3946 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
|
3947 static Lisp_Object dump_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3948 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3949 void |
364 | 3950 init_lread () |
341 | 3951 { |
617 | 3952 char *normal; |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3953 int turn_off_warning = 0; |
341 | 3954 |
364 | 3955 /* Compute the default load-path. */ |
617 | 3956 #ifdef CANNOT_DUMP |
3957 normal = PATH_LOADSEARCH; | |
638 | 3958 Vload_path = decode_env_path (0, normal); |
617 | 3959 #else |
3960 if (NILP (Vpurify_flag)) | |
3961 normal = PATH_LOADSEARCH; | |
3962 else | |
3963 normal = PATH_DUMPLOADSEARCH; | |
3964 | |
3965 /* In a dumped Emacs, we normally have to reset the value of | |
3966 Vload_path from PATH_LOADSEARCH, since the value that was dumped | |
3967 uses ../lisp, instead of the path of the installed elisp | |
3968 libraries. However, if it appears that Vload_path was changed | |
3969 from the default before dumping, don't override that value. */ | |
621 | 3970 if (initialized) |
3971 { | |
3972 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
|
3973 { |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3974 Vload_path = decode_env_path (0, normal); |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3975 if (!NILP (Vinstallation_directory)) |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3976 { |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3977 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
|
3978 |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3979 /* 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
|
3980 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
|
3981 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
|
3982 sitelisp = Qnil; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3983 while (1) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3984 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3985 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
|
3986 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
|
3987 tem, Qnil); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3988 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
|
3989 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3990 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
|
3991 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
|
3992 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3993 else |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3994 break; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3995 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3996 |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3997 /* 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
|
3998 installation dir, if it exists. */ |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3999 tem = Fexpand_file_name (build_string ("lisp"), |
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4000 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
|
4001 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
|
4002 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
|
4003 { |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4004 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
|
4005 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4006 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
|
4007 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
|
4008 } |
7004
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4009 } |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4010 else |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4011 /* 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
|
4012 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
|
4013 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
|
4014 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4015 /* 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
|
4016 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
|
4017 Vinstallation_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4018 tem1 = Ffile_exists_p (tem); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4019 if (!NILP (tem1)) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4020 { |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4021 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
|
4022 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
|
4023 } |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4024 |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
4025 /* Add site-lisp under the installation dir, if it exists. */ |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4026 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
|
4027 Vinstallation_directory); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4028 tem1 = Ffile_exists_p (tem); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4029 if (!NILP (tem1)) |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4030 { |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4031 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
|
4032 Vload_path = Fcons (tem, Vload_path); |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4033 } |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4034 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4035 /* 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
|
4036 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
|
4037 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
|
4038 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4039 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
|
4040 { |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4041 Lisp_Object tem2; |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4042 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4043 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
|
4044 Vinstallation_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4045 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
|
4046 |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4047 /* 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
|
4048 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
|
4049 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
|
4050 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
|
4051 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
|
4052 Vinstallation_directory); |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4053 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
|
4054 if (!NILP (tem1) && NILP (tem2)) |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4055 { |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4056 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
|
4057 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4058 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4059 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
|
4060 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
|
4061 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4062 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
|
4063 Vsource_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4064 |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4065 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
|
4066 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
|
4067 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4068 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
|
4069 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4070 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4071 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
|
4072 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
|
4073 } |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4074 } |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4075 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
|
4076 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
|
4077 } |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
4078 } |
621 | 4079 } |
4080 else | |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4081 { |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
4082 /* 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
|
4083 /* 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
|
4084 that caused trouble because it was copied from dump_path |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
4085 into Vload_path, above, when Vinstallation_directory was non-nil. |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
4086 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
|
4087 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
|
4088 dump_path = Vload_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4089 } |
364 | 4090 #endif |
4091 | |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
4092 #if (!(defined(WINDOWSNT) || (defined(HAVE_NS)))) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4093 /* 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
|
4094 almost never correct, thereby causing a warning to be printed out that |
14036 | 4095 confuses users. Since PATH_LOADSEARCH is always overridden by the |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
4096 EMACSLOADPATH environment variable below, disable the warning on NT. */ |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
4097 |
341 | 4098 /* 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
|
4099 if (!turn_off_warning) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4100 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4101 Lisp_Object path_tail; |
341 | 4102 |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4103 for (path_tail = Vload_path; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4104 !NILP (path_tail); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
4105 path_tail = XCDR (path_tail)) |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4106 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4107 Lisp_Object dirfile; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4108 dirfile = Fcar (path_tail); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4109 if (STRINGP (dirfile)) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4110 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4111 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
|
4112 if (access (SDATA (dirfile), 0) < 0) |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4113 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
|
4114 XCAR (path_tail)); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4115 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4116 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4117 } |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
4118 #endif /* !(WINDOWSNT || HAVE_NS) */ |
617 | 4119 |
4120 /* If the EMACSLOADPATH environment variable is set, use its value. | |
4121 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
|
4122 #ifndef CANNOT_DUMP |
617 | 4123 if (NILP (Vpurify_flag) |
4124 && egetenv ("EMACSLOADPATH")) | |
11955
d972c95e7577
(init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11868
diff
changeset
|
4125 #endif |
364 | 4126 Vload_path = decode_env_path ("EMACSLOADPATH", normal); |
4127 | |
4128 Vvalues = Qnil; | |
4129 | |
341 | 4130 load_in_progress = 0; |
15283
b2be450a8da4
(init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
15091
diff
changeset
|
4131 Vload_file_name = Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4132 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4133 load_descriptor_list = Qnil; |
21291
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4134 |
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4135 Vstandard_input = Qt; |
31536
76cf765a7dad
(init_lread): Set Vloads_in_progress to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
31534
diff
changeset
|
4136 Vloads_in_progress = Qnil; |
341 | 4137 } |
4138 | |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4139 /* Print a warning, using format string FORMAT, that directory DIRNAME |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
4140 does not exist. Print it on stderr and put it in *Messages*. */ |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4141 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
4142 void |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4143 dir_warning (format, dirname) |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4144 char *format; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4145 Lisp_Object dirname; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4146 { |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4147 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
|
4148 = (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
|
4149 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4150 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
|
4151 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
|
4152 /* 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
|
4153 if (initialized) |
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
4154 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
|
4155 } |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4156 |
341 | 4157 void |
364 | 4158 syms_of_lread () |
341 | 4159 { |
4160 defsubr (&Sread); | |
4161 defsubr (&Sread_from_string); | |
4162 defsubr (&Sintern); | |
4163 defsubr (&Sintern_soft); | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
4164 defsubr (&Sunintern); |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4165 defsubr (&Sget_load_suffixes); |
341 | 4166 defsubr (&Sload); |
672 | 4167 defsubr (&Seval_buffer); |
341 | 4168 defsubr (&Seval_region); |
4169 defsubr (&Sread_char); | |
4170 defsubr (&Sread_char_exclusive); | |
4171 defsubr (&Sread_event); | |
4172 defsubr (&Sget_file_char); | |
4173 defsubr (&Smapatoms); | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
4174 defsubr (&Slocate_file_internal); |
341 | 4175 |
4176 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
|
4177 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
|
4178 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
|
4179 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
|
4180 to find all the symbols in an obarray, use `mapatoms'. */); |
341 | 4181 |
4182 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
|
4183 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
|
4184 Order is reverse chronological. */); |
341 | 4185 |
4186 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
|
4187 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
|
4188 See documentation of `read' for possible values. */); |
341 | 4189 Vstandard_input = Qt; |
4190 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4191 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
|
4192 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
|
4193 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4194 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
|
4195 will be added to `read-symbol-positions-list'. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4196 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
|
4197 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
|
4198 defined, although they may be in the future. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4199 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4200 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
|
4201 `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
|
4202 the toplevel; bind it instead. */); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4203 Vread_with_symbol_positions = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4204 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4205 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
|
4206 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
|
4207 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
|
4208 `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
|
4209 non-nil. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4210 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4211 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
|
4212 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
|
4213 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
|
4214 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4215 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
|
4216 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
|
4217 were read in. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4218 Vread_symbol_positions_list = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4219 |
341 | 4220 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
|
4221 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
|
4222 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
|
4223 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
|
4224 otherwise to default specified by file `epaths.h' when Emacs was built. */); |
341 | 4225 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4226 DEFVAR_LISP ("load-suffixes", &Vload_suffixes, |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4227 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
|
4228 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
|
4229 `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
|
4230 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
|
4231 Vload_suffixes = Fcons (build_string (".elc"), |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4232 Fcons (build_string (".el"), Qnil)); |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4233 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
|
4234 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
|
4235 the same file. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4236 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
|
4237 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4238 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
|
4239 `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
|
4240 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
|
4241 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
|
4242 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
|
4243 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
|
4244 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
|
4245 customize `jka-compr-load-suffixes' rather than the present variable. */); |
81270
0bf4e298d593
(syms_of_lread, openp): Use empty_unibyte_string, not build_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
80808
diff
changeset
|
4246 Vload_file_rep_suffixes = Fcons (empty_unibyte_string, Qnil); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4247 |
341 | 4248 DEFVAR_BOOL ("load-in-progress", &load_in_progress, |
78501 | 4249 doc: /* Non-nil if inside of `load'. */); |
341 | 4250 |
4251 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
|
4252 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
|
4253 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
|
4254 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4255 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
|
4256 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
|
4257 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4258 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
|
4259 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
|
4260 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
|
4261 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4262 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
|
4263 the rest of the FORMS. */); |
341 | 4264 Vafter_load_alist = Qnil; |
4265 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
4266 DEFVAR_LISP ("load-history", &Vload_history, |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
4267 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
|
4268 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
|
4269 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
|
4270 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
|
4271 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4272 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
|
4273 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
|
4274 |
59108
f83ca2ccbeeb
(syms_of_lread) <load-history>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58517
diff
changeset
|
4275 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
|
4276 and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)', |
75632
ee1bb0e6b772
(syms_of_lread) <load-history>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75594
diff
changeset
|
4277 `(defun . FUNCTION)', `(autoload . SYMBOL)', `(defface . SYMBOL)' |
ee1bb0e6b772
(syms_of_lread) <load-history>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75594
diff
changeset
|
4278 and `(t . SYMBOL)'. An element `(t . SYMBOL)' precedes an entry |
ee1bb0e6b772
(syms_of_lread) <load-history>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75594
diff
changeset
|
4279 `(defun . FUNCTION)', and means that SYMBOL was an autoload before |
ee1bb0e6b772
(syms_of_lread) <load-history>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75594
diff
changeset
|
4280 this file redefined it as a function. |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
4281 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
4282 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
|
4283 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
|
4284 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
|
4285 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4286 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
|
4287 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
|
4288 Vload_file_name = Qnil; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4289 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4290 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
|
4291 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
|
4292 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
|
4293 exists, this variable contains the name of source file, suitable for use |
75594
8c74b56c521b
(syms_of_lread) <user-init-file>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4294 by functions like `custom-save-all' which edit the init file. |
8c74b56c521b
(syms_of_lread) <user-init-file>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4295 While Emacs loads and evaluates the init file, value is the real name |
8c74b56c521b
(syms_of_lread) <user-init-file>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4296 of the file, regardless of whether or not it has the `.elc' extension. */); |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4297 Vuser_init_file = Qnil; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4298 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
4299 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
|
4300 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
|
4301 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
|
4302 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4303 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
|
4304 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
|
4305 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
|
4306 Vload_read_function = Qnil; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4307 |
17038 | 4308 DEFVAR_LISP ("load-source-file-function", &Vload_source_file_function, |
73800
4d1706442c96
(syms_of_lread): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
72132
diff
changeset
|
4309 doc: /* Function called in `load' for loading an Emacs Lisp source file. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4310 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
|
4311 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
|
4312 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
|
4313 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
|
4314 See `load' for the meaning of the remaining arguments. */); |
17038 | 4315 Vload_source_file_function = Qnil; |
4316 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4317 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
|
4318 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
|
4319 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
|
4320 load_force_doc_strings = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4321 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4322 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
|
4323 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
|
4324 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
|
4325 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
|
4326 load_convert_to_unibyte = 0; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4327 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
4328 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
|
4329 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
|
4330 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
|
4331 Vsource_directory |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4332 = Fexpand_file_name (build_string ("../"), |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4333 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH))); |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4334 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4335 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
|
4336 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
|
4337 Vpreloaded_file_list = Qnil; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4338 |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4339 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
|
4340 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
|
4341 Vbyte_boolean_vars = Qnil; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4342 |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4343 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
|
4344 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
|
4345 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
|
4346 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
|
4347 them. */); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4348 load_dangerous_libraries = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4349 |
31367
22eb2b661cdf
(syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents:
31315
diff
changeset
|
4350 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
|
4351 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
|
4352 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
|
4353 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
|
4354 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
|
4355 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
|
4356 Vbytecomp_version_regexp |
31464
2efc0e152012
(syms_of_lread): Change value of regexp
Gerd Moellmann <gerd@gnu.org>
parents:
31367
diff
changeset
|
4357 = build_string ("^;;;.\\(in Emacs version\\|bytecomp version FSF\\)"); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4358 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4359 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
|
4360 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
|
4361 Veval_buffer_list = Qnil; |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4362 |
78614
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4363 DEFVAR_LISP ("old-style-backquotes", &Vold_style_backquotes, |
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4364 doc: /* Set to non-nil when `read' encounters an old-style backquote. */); |
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4365 Vold_style_backquotes = Qnil; |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
4366 Qold_style_backquotes = intern ("old-style-backquotes"); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
4367 staticpro (&Qold_style_backquotes); |
78614
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4368 |
14300
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4369 /* Vsource_directory was initialized in init_lread. */ |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4370 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4371 load_descriptor_list = Qnil; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4372 staticpro (&load_descriptor_list); |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4373 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
4374 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
|
4375 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
|
4376 |
341 | 4377 Qstandard_input = intern ("standard-input"); |
4378 staticpro (&Qstandard_input); | |
4379 | |
4380 Qread_char = intern ("read-char"); | |
4381 staticpro (&Qread_char); | |
4382 | |
4383 Qget_file_char = intern ("get-file-char"); | |
4384 staticpro (&Qget_file_char); | |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4385 |
88886 | 4386 Qget_emacs_mule_file_char = intern ("get-emacs-mule-file-char"); |
4387 staticpro (&Qget_emacs_mule_file_char); | |
4388 | |
4389 Qload_force_doc_strings = intern ("load-force-doc-strings"); | |
4390 staticpro (&Qload_force_doc_strings); | |
4391 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4392 Qbackquote = intern ("`"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4393 staticpro (&Qbackquote); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4394 Qcomma = intern (","); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4395 staticpro (&Qcomma); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4396 Qcomma_at = intern (",@"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4397 staticpro (&Qcomma_at); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4398 Qcomma_dot = intern (",."); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4399 staticpro (&Qcomma_dot); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4400 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
4401 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
|
4402 staticpro (&Qinhibit_file_name_operation); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
4403 |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4404 Qascii_character = intern ("ascii-character"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4405 staticpro (&Qascii_character); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4406 |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4407 Qfunction = intern ("function"); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4408 staticpro (&Qfunction); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4409 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4410 Qload = intern ("load"); |
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4411 staticpro (&Qload); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4412 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4413 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
|
4414 staticpro (&Qload_file_name); |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4415 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4416 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
|
4417 staticpro (&Qeval_buffer_list); |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4418 |
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
|
4419 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
|
4420 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
|
4421 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4422 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
|
4423 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
|
4424 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4425 staticpro (&dump_path); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4426 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4427 staticpro (&read_objects); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4428 read_objects = Qnil; |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
4429 staticpro (&seen_list); |
64317
f69dd5d2d72d
(syms_of_lread): Initialize seen_list.
Kim F. Storm <storm@cua.dk>
parents:
64205
diff
changeset
|
4430 seen_list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4431 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4432 Vloads_in_progress = Qnil; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4433 staticpro (&Vloads_in_progress); |
341 | 4434 } |
52401 | 4435 |
4436 /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d | |
4437 (do not change this comment) */ |