Mercurial > emacs
annotate src/lread.c @ 21653:e95a88dc6110
*** empty log message ***
author | Dan Nicolaescu <done@ece.arizona.edu> |
---|---|
date | Sat, 18 Apr 1998 20:43:38 +0000 |
parents | 10d8ced94467 |
children | f42b78e033db |
rev | line source |
---|---|
341 | 1 /* Lisp parsing and input streams. |
20706 | 2 Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 1998 |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3 Free Software Foundation, Inc. |
341 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
617 | 9 the Free Software Foundation; either version 2, or (at your option) |
341 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14130
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14130
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
341 | 21 |
22 | |
7898 | 23 #include <config.h> |
341 | 24 #include <stdio.h> |
25 #include <sys/types.h> | |
26 #include <sys/stat.h> | |
27 #include <sys/file.h> | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
28 #include <errno.h> |
341 | 29 #include "lisp.h" |
30 | |
31 #ifndef standalone | |
32 #include "buffer.h" | |
17038 | 33 #include "charset.h" |
4701
05f6a91c2801
Include <paths.h>, not "paths.h".
Roland McGrath <roland@gnu.org>
parents:
4696
diff
changeset
|
34 #include <paths.h> |
341 | 35 #include "commands.h" |
1591
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
36 #include "keyboard.h" |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
37 #include "termhooks.h" |
341 | 38 #endif |
39 | |
40 #ifdef lint | |
41 #include <sys/inode.h> | |
42 #endif /* lint */ | |
43 | |
14972
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
44 #ifdef MSDOS |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
45 #if __DJGPP__ < 2 |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
46 #include <unistd.h> /* to get X_OK */ |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
47 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
48 #include "msdos.h" |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
49 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
50 |
341 | 51 #ifndef X_OK |
52 #define X_OK 01 | |
53 #endif | |
54 | |
55 #ifdef LISP_FLOAT_TYPE | |
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2654
diff
changeset
|
56 #ifdef STDC_HEADERS |
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2654
diff
changeset
|
57 #include <stdlib.h> |
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2654
diff
changeset
|
58 #endif |
5496
24f0d2908e61
[MSDOS]: Use text mode for all files but ".elc" files.
Richard M. Stallman <rms@gnu.org>
parents:
5243
diff
changeset
|
59 |
341 | 60 #include <math.h> |
61 #endif /* LISP_FLOAT_TYPE */ | |
62 | |
14950 | 63 #ifdef HAVE_SETLOCALE |
64 #include <locale.h> | |
65 #endif /* HAVE_SETLOCALE */ | |
66 | |
8596 | 67 #ifndef O_RDONLY |
68 #define O_RDONLY 0 | |
69 #endif | |
70 | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
71 extern int errno; |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
72 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
73 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; |
341 | 74 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
|
75 Lisp_Object Qascii_character, Qload, Qload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
76 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
|
77 Lisp_Object Qinhibit_file_name_operation; |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
78 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
79 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
|
80 extern Lisp_Object Qfile_exists_p; |
341 | 81 |
82 /* non-zero if inside `load' */ | |
83 int load_in_progress; | |
84 | |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
85 /* Directory in which the sources were found. */ |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
86 Lisp_Object Vsource_directory; |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
87 |
341 | 88 /* Search path for files to be loaded. */ |
89 Lisp_Object Vload_path; | |
90 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
91 /* 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
|
92 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
|
93 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
|
94 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
95 /* 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
|
96 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
|
97 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
98 /* List of files that were preloaded. */ |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
99 Lisp_Object Vpreloaded_file_list; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
100 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
101 /* 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
|
102 Lisp_Object Vload_file_name; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
103 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
104 /* 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
|
105 Lisp_Object Vload_read_function; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
106 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
107 /* 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
|
108 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
|
109 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
|
110 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
|
111 Lisp_Object read_objects; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
112 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
113 /* 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
|
114 static int load_force_doc_strings; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
115 |
17038 | 116 /* Function to use for loading an Emacs lisp source file (not |
117 compiled) instead of readevalloop. */ | |
118 Lisp_Object Vload_source_file_function; | |
119 | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
120 /* 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
|
121 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
|
122 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
123 /* File for get_file_char to read from. Use by load. */ |
341 | 124 static FILE *instream; |
125 | |
126 /* When nonzero, read conses in pure space */ | |
127 static int read_pure; | |
128 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
129 /* For use within read-from-string (this reader is non-reentrant!!) */ |
341 | 130 static int read_from_string_index; |
131 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
|
132 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
133 /* Number of bytes left to read in the buffer character |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
134 that `readchar' has already advanced over. */ |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
135 static int readchar_backlog; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
136 |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
137 /* This contains the last string skipped with #@, but only on some systems. |
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
138 On other systems we can't put the string here. */ |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
139 static char *saved_doc_string; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
140 /* Length of buffer allocated in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
141 static int saved_doc_string_size; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
142 /* Length of actual data in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
143 static int saved_doc_string_length; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
144 /* This is the file position that string came from. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
145 static int saved_doc_string_position; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
146 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
147 /* 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
|
148 with no surrounding parentheses. |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
149 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
|
150 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
|
151 static int new_backquote_flag; |
341 | 152 |
153 /* Handle unreading and rereading of characters. | |
154 Write READCHAR to read a character, | |
17038 | 155 UNREAD(c) to unread c to be read again. |
156 | |
157 These macros actually read/unread a byte code, multibyte characters | |
158 are not handled here. The caller should manage them if necessary. | |
159 */ | |
341 | 160 |
161 #define READCHAR readchar (readcharfun) | |
162 #define UNREAD(c) unreadchar (readcharfun, c) | |
163 | |
164 static int | |
165 readchar (readcharfun) | |
166 Lisp_Object readcharfun; | |
167 { | |
168 Lisp_Object tem; | |
169 register struct buffer *inbuffer; | |
170 register int c, mpos; | |
171 | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
172 if (BUFFERP (readcharfun)) |
341 | 173 { |
174 inbuffer = XBUFFER (readcharfun); | |
175 | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
176 if (readchar_backlog == 0) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
177 { |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
178 int pt_byte = BUF_PT_BYTE (inbuffer); |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
179 int orig_pt_byte = pt_byte; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
180 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
181 if (pt_byte >= BUF_ZV_BYTE (inbuffer)) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
182 return -1; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
183 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
184 if (! NILP (inbuffer->enable_multibyte_characters)) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
185 BUF_INC_POS (inbuffer, pt_byte); |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
186 else |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
187 pt_byte++; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
188 SET_BUF_PT_BOTH (inbuffer, BUF_PT (inbuffer) + 1, pt_byte); |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
189 readchar_backlog = pt_byte - orig_pt_byte; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
190 } |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
191 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
192 /* We get the address of the byte just passed, |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
193 which is the last byte of the character. |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
194 The other bytes in this character are consecutive with it, |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
195 because the gap can't be in the middle of a character. */ |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
196 return *(BUF_BYTE_ADDRESS (inbuffer, BUF_PT_BYTE (inbuffer) - 1) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
197 - --readchar_backlog); |
341 | 198 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
199 if (MARKERP (readcharfun)) |
341 | 200 { |
201 inbuffer = XMARKER (readcharfun)->buffer; | |
202 | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
203 if (readchar_backlog == 0) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
204 { |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
205 int bytepos = marker_byte_position (readcharfun); |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
206 int orig_bytepos = bytepos; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
207 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
208 if (bytepos >= BUF_ZV_BYTE (inbuffer)) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
209 return -1; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
210 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
211 if (! NILP (inbuffer->enable_multibyte_characters)) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
212 INC_POS (bytepos); |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
213 else |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
214 bytepos++; |
20566
0877f6e6fc15
(readchar): Use marker's bytepos instead of bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20548
diff
changeset
|
215 XMARKER (readcharfun)->bytepos = bytepos; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
216 XMARKER (readcharfun)->charpos++; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
217 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
218 readchar_backlog = bytepos - orig_bytepos; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
219 } |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
220 |
21635
83541dfdf8ee
(readchar): Find the previous byte's address properly
Richard M. Stallman <rms@gnu.org>
parents:
21291
diff
changeset
|
221 /* We get the address of the byte just passed, |
83541dfdf8ee
(readchar): Find the previous byte's address properly
Richard M. Stallman <rms@gnu.org>
parents:
21291
diff
changeset
|
222 which is the last byte of the character. |
83541dfdf8ee
(readchar): Find the previous byte's address properly
Richard M. Stallman <rms@gnu.org>
parents:
21291
diff
changeset
|
223 The other bytes in this character are consecutive with it, |
83541dfdf8ee
(readchar): Find the previous byte's address properly
Richard M. Stallman <rms@gnu.org>
parents:
21291
diff
changeset
|
224 because the gap can't be in the middle of a character. */ |
83541dfdf8ee
(readchar): Find the previous byte's address properly
Richard M. Stallman <rms@gnu.org>
parents:
21291
diff
changeset
|
225 return *(BUF_BYTE_ADDRESS (inbuffer, XMARKER (readcharfun)->bytepos - 1) |
83541dfdf8ee
(readchar): Find the previous byte's address properly
Richard M. Stallman <rms@gnu.org>
parents:
21291
diff
changeset
|
226 - --readchar_backlog); |
341 | 227 } |
228 if (EQ (readcharfun, Qget_file_char)) | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
229 { |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
230 c = getc (instream); |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
231 #ifdef EINTR |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
232 /* Interrupted reads have been observed while reading over the network */ |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
233 while (c == EOF && ferror (instream) && errno == EINTR) |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
234 { |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
235 clearerr (instream); |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
236 c = getc (instream); |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
237 } |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
238 #endif |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
239 return c; |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
240 } |
341 | 241 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
242 if (STRINGP (readcharfun)) |
341 | 243 { |
244 register int c; | |
245 /* This used to be return of a conditional expression, | |
246 but that truncated -1 to a char on VMS. */ | |
247 if (read_from_string_index < read_from_string_limit) | |
248 c = XSTRING (readcharfun)->data[read_from_string_index++]; | |
249 else | |
250 c = -1; | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
251 |
341 | 252 return c; |
253 } | |
254 | |
255 tem = call0 (readcharfun); | |
256 | |
485 | 257 if (NILP (tem)) |
341 | 258 return -1; |
259 return XINT (tem); | |
260 } | |
261 | |
262 /* Unread the character C in the way appropriate for the stream READCHARFUN. | |
263 If the stream is a user function, call it with the char as argument. */ | |
264 | |
265 static void | |
266 unreadchar (readcharfun, c) | |
267 Lisp_Object readcharfun; | |
268 int c; | |
269 { | |
6471
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
270 if (c == -1) |
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
271 /* 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
|
272 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
|
273 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
274 else if (BUFFERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
275 { |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
276 if (!SINGLE_BYTE_CHAR_P (c)) |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
277 readchar_backlog++; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
278 else |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
279 { |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
280 struct buffer *b = XBUFFER (readcharfun); |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
281 int bytepos = BUF_PT_BYTE (b); |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
282 |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
283 BUF_PT (b)--; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
284 if (! NILP (b->enable_multibyte_characters)) |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
285 BUF_DEC_POS (b, bytepos); |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
286 else |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
287 bytepos--; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
288 |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
289 BUF_PT_BYTE (b) = bytepos; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
290 } |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
291 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
292 else if (MARKERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
293 { |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
294 if (!SINGLE_BYTE_CHAR_P (c)) |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
295 readchar_backlog++; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
296 else |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
297 { |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
298 struct buffer *b = XMARKER (readcharfun)->buffer; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
299 int bytepos = XMARKER (readcharfun)->bytepos; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
300 |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
301 XMARKER (readcharfun)->charpos--; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
302 if (! NILP (b->enable_multibyte_characters)) |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
303 BUF_DEC_POS (b, bytepos); |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
304 else |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
305 bytepos--; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
306 |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
307 XMARKER (readcharfun)->bytepos = bytepos; |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
308 } |
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
309 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
310 else if (STRINGP (readcharfun)) |
341 | 311 read_from_string_index--; |
312 else if (EQ (readcharfun, Qget_file_char)) | |
313 ungetc (c, instream); | |
314 else | |
315 call1 (readcharfun, make_number (c)); | |
316 } | |
317 | |
318 static Lisp_Object read0 (), read1 (), read_list (), read_vector (); | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
319 static int read_multibyte (); |
341 | 320 |
321 /* get a character from the tty */ | |
322 | |
1519
5d0837ebee9c
* lread.c (read_char): Add an extern declaration for this,
Jim Blandy <jimb@redhat.com>
parents:
1092
diff
changeset
|
323 extern Lisp_Object read_char (); |
5d0837ebee9c
* lread.c (read_char): Add an extern declaration for this,
Jim Blandy <jimb@redhat.com>
parents:
1092
diff
changeset
|
324 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
325 /* 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
|
326 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
327 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
|
328 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
|
329 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
|
330 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
331 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
|
332 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
|
333 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
|
334 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
335 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
|
336 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
|
337 ASCII_REQUIRED is non-zero, we just re-read until we get an ASCII |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
338 character. */ |
14483
7f49c41db1e8
(Fread_char_exclusive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14300
diff
changeset
|
339 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
340 Lisp_Object |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
341 read_filtered_event (no_switch_frame, ascii_required, error_nonascii) |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
342 int no_switch_frame, ascii_required, error_nonascii; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
343 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
344 #ifdef standalone |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
345 return make_number (getchar ()); |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
346 #else |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
347 register Lisp_Object val, delayed_switch_frame; |
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
348 |
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
349 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
|
350 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
351 /* Read until we get an acceptable event. */ |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
352 retry: |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
353 val = read_char (0, 0, 0, Qnil, 0); |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
354 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
355 if (BUFFERP (val)) |
5888
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
356 goto retry; |
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
357 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
358 /* switch-frame events are put off until after the next ASCII |
14036 | 359 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
|
360 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
|
361 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
|
362 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
|
363 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
|
364 && EVENT_HAS_PARAMETERS (val) |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
365 && EQ (EVENT_HEAD (val), Qswitch_frame)) |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
366 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
367 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
|
368 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
369 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
370 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
371 if (ascii_required) |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
372 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
373 /* 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
|
374 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
|
375 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
376 Lisp_Object tem, tem1, tem2; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
377 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
|
378 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
|
379 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
380 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
|
381 /* 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
|
382 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
|
383 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
|
384 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
|
385 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
386 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
387 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
388 /* 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
|
389 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
|
390 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
391 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
|
392 { |
7106
06542cc6ddcd
(read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
393 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
|
394 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
|
395 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
396 else |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
397 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
398 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
399 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
400 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
401 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
|
402 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
|
403 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
404 return val; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
405 #endif |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
406 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
407 |
341 | 408 DEFUN ("read-char", Fread_char, Sread_char, 0, 0, 0, |
409 "Read a character from the command input (keyboard or macro).\n\ | |
851 | 410 It is returned as a number.\n\ |
411 If the user generates an event which is not a character (i.e. a mouse\n\ | |
1591
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
412 click or function key event), `read-char' signals an error. As an\n\ |
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
413 exception, switch-frame events are put off until non-ASCII events can\n\ |
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
414 be read.\n\ |
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
415 If you want to read non-character events, or ignore them, call\n\ |
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
416 `read-event' or `read-char-exclusive' instead.") |
341 | 417 () |
418 { | |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
419 return read_filtered_event (1, 1, 1); |
341 | 420 } |
421 | |
422 DEFUN ("read-event", Fread_event, Sread_event, 0, 0, 0, | |
423 "Read an event object from the input stream.") | |
424 () | |
425 { | |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
426 return read_filtered_event (0, 0, 0); |
341 | 427 } |
428 | |
429 DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 0, 0, | |
430 "Read a character from the command input (keyboard or macro).\n\ | |
14483
7f49c41db1e8
(Fread_char_exclusive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14300
diff
changeset
|
431 It is returned as a number. Non-character events are ignored.") |
341 | 432 () |
433 { | |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
434 return read_filtered_event (1, 1, 0); |
341 | 435 } |
436 | |
437 DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0, | |
438 "Don't use this yourself.") | |
439 () | |
440 { | |
441 register Lisp_Object val; | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
442 XSETINT (val, getc (instream)); |
341 | 443 return val; |
444 } | |
445 | |
446 static void readevalloop (); | |
447 static Lisp_Object load_unwind (); | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
448 static Lisp_Object load_descriptor_unwind (); |
341 | 449 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
450 DEFUN ("load", Fload, Sload, 1, 5, 0, |
341 | 451 "Execute a file of Lisp code named FILE.\n\ |
452 First try FILE with `.elc' appended, then try with `.el',\n\ | |
453 then try FILE unmodified.\n\ | |
454 This function searches the directories in `load-path'.\n\ | |
455 If optional second arg NOERROR is non-nil,\n\ | |
456 report no error if FILE doesn't exist.\n\ | |
457 Print messages at start and end of loading unless\n\ | |
458 optional third arg NOMESSAGE is non-nil.\n\ | |
459 If optional fourth arg NOSUFFIX is non-nil, don't try adding\n\ | |
460 suffixes `.elc' or `.el' to the specified name FILE.\n\ | |
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
|
461 If optional fifth arg MUST-SUFFIX is non-nil, insist on\n\ |
19626
a9f87afd5ac6
(Fload): Fix doc syntax.
Richard M. Stallman <rms@gnu.org>
parents:
19622
diff
changeset
|
462 the suffix `.elc' or `.el'; don't accept just FILE unless\n\ |
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
|
463 it ends in one of those suffixes or includes a directory name.\n\ |
341 | 464 Return t if file exists.") |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
465 (file, noerror, nomessage, nosuffix, must_suffix) |
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
466 Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; |
341 | 467 { |
468 register FILE *stream; | |
469 register int fd = -1; | |
470 register Lisp_Object lispstream; | |
471 int count = specpdl_ptr - specpdl; | |
472 Lisp_Object temp; | |
473 struct gcpro gcpro1; | |
474 Lisp_Object found; | |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
475 /* 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
|
476 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
|
477 /* 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
|
478 int compiled = 0; |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
479 Lisp_Object handler; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
480 #ifdef DOS_NT |
5496
24f0d2908e61
[MSDOS]: Use text mode for all files but ".elc" files.
Richard M. Stallman <rms@gnu.org>
parents:
5243
diff
changeset
|
481 char *dosmode = "rt"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
482 #endif /* DOS_NT */ |
341 | 483 |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
484 CHECK_STRING (file, 0); |
341 | 485 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
486 /* If file name is magic, call the handler. */ |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
487 handler = Ffind_file_name_handler (file, Qload); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
488 if (!NILP (handler)) |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
489 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
|
490 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
491 /* 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
|
492 the need to gcpro noerror, nomessage and nosuffix. |
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
493 (Below here, we care only whether they are nil or not.) */ |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
494 file = Fsubstitute_in_file_name (file); |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
495 |
341 | 496 /* Avoid weird lossage with null string as arg, |
497 since it would try to load a directory as a Lisp file */ | |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
498 if (XSTRING (file)->size > 0) |
341 | 499 { |
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
|
500 int size = XSTRING (file)->size; |
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
|
501 |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
502 GCPRO1 (file); |
19622
be0876941b71
(Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents:
19240
diff
changeset
|
503 |
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
|
504 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
|
505 { |
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
|
506 /* 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
|
507 if (size > 3 |
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
|
508 && !strcmp (XSTRING (file)->data + size - 3, ".el")) |
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
|
509 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
|
510 else if (size > 4 |
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
|
511 && !strcmp (XSTRING (file)->data + size - 4, ".elc")) |
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
|
512 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
|
513 /* 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
|
514 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
|
515 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
|
516 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
|
517 } |
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
|
518 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
519 fd = openp (Vload_path, file, |
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
520 (!NILP (nosuffix) ? "" |
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
521 : ! NILP (must_suffix) ? ".elc:.el" |
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
522 : ".elc:.el:"), |
341 | 523 &found, 0); |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
524 UNGCPRO; |
341 | 525 } |
526 | |
527 if (fd < 0) | |
528 { | |
485 | 529 if (NILP (noerror)) |
341 | 530 while (1) |
531 Fsignal (Qfile_error, Fcons (build_string ("Cannot open load file"), | |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
532 Fcons (file, Qnil))); |
341 | 533 else |
534 return Qnil; | |
535 } | |
536 | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
537 /* If FD is 0, that means openp found a remote file. */ |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
538 if (fd == 0) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
539 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
540 handler = Ffind_file_name_handler (found, Qload); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
541 return call5 (handler, Qload, found, noerror, nomessage, Qt); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
542 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
543 |
341 | 544 if (!bcmp (&(XSTRING (found)->data[XSTRING (found)->size - 4]), |
545 ".elc", 4)) | |
546 { | |
547 struct stat s1, s2; | |
548 int result; | |
549 | |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
550 compiled = 1; |
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
551 |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
552 #ifdef DOS_NT |
5496
24f0d2908e61
[MSDOS]: Use text mode for all files but ".elc" files.
Richard M. Stallman <rms@gnu.org>
parents:
5243
diff
changeset
|
553 dosmode = "rb"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
554 #endif /* DOS_NT */ |
6072
8af8f6b469e1
(Fload): Cast the args to stat.
Richard M. Stallman <rms@gnu.org>
parents:
5888
diff
changeset
|
555 stat ((char *)XSTRING (found)->data, &s1); |
341 | 556 XSTRING (found)->data[XSTRING (found)->size - 1] = 0; |
6072
8af8f6b469e1
(Fload): Cast the args to stat.
Richard M. Stallman <rms@gnu.org>
parents:
5888
diff
changeset
|
557 result = stat ((char *)XSTRING (found)->data, &s2); |
341 | 558 if (result >= 0 && (unsigned) s1.st_mtime < (unsigned) s2.st_mtime) |
1758
12c730b89ac8
(Fload): If warn that .elc file is older,
Richard M. Stallman <rms@gnu.org>
parents:
1591
diff
changeset
|
559 { |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
560 /* Make the progress messages mention that source is newer. */ |
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
561 newer = 1; |
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
562 |
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
563 /* If we won't print another message, mention this anyway. */ |
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
564 if (! NILP (nomessage)) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
565 message_with_string ("Source file `%s' newer than byte-compiled file", |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
566 found, 1); |
1758
12c730b89ac8
(Fload): If warn that .elc file is older,
Richard M. Stallman <rms@gnu.org>
parents:
1591
diff
changeset
|
567 } |
341 | 568 XSTRING (found)->data[XSTRING (found)->size - 1] = 'c'; |
569 } | |
17038 | 570 else |
571 { | |
572 /* We are loading a source file (*.el). */ | |
573 if (!NILP (Vload_source_file_function)) | |
574 { | |
575 close (fd); | |
17125
4a6c43010388
(Fload): Call Vload_source_file_function with 4 args.
Erik Naggum <erik@naggum.no>
parents:
17038
diff
changeset
|
576 return call4 (Vload_source_file_function, found, file, |
17038 | 577 NILP (noerror) ? Qnil : Qt, |
578 NILP (nomessage) ? Qnil : Qt); | |
579 } | |
580 } | |
341 | 581 |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
582 #ifdef DOS_NT |
5496
24f0d2908e61
[MSDOS]: Use text mode for all files but ".elc" files.
Richard M. Stallman <rms@gnu.org>
parents:
5243
diff
changeset
|
583 close (fd); |
24f0d2908e61
[MSDOS]: Use text mode for all files but ".elc" files.
Richard M. Stallman <rms@gnu.org>
parents:
5243
diff
changeset
|
584 stream = fopen ((char *) XSTRING (found)->data, dosmode); |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
585 #else /* not DOS_NT */ |
341 | 586 stream = fdopen (fd, "r"); |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
587 #endif /* not DOS_NT */ |
341 | 588 if (stream == 0) |
589 { | |
590 close (fd); | |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
591 error ("Failure to create stdio stream for %s", XSTRING (file)->data); |
341 | 592 } |
593 | |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
594 if (! NILP (Vpurify_flag)) |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
595 Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list); |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
596 |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
597 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
|
598 { |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
599 if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
600 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
|
601 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
602 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
|
603 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
604 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
|
605 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
|
606 } |
341 | 607 |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
608 GCPRO1 (file); |
9361
c11cc966dc6a
(Fload, load_unwind): Store stream pointer as a cons of two integers,
Karl Heuer <kwzh@gnu.org>
parents:
9358
diff
changeset
|
609 lispstream = Fcons (Qnil, Qnil); |
c11cc966dc6a
(Fload, load_unwind): Store stream pointer as a cons of two integers,
Karl Heuer <kwzh@gnu.org>
parents:
9358
diff
changeset
|
610 XSETFASTINT (XCONS (lispstream)->car, (EMACS_UINT)stream >> 16); |
c11cc966dc6a
(Fload, load_unwind): Store stream pointer as a cons of two integers,
Karl Heuer <kwzh@gnu.org>
parents:
9358
diff
changeset
|
611 XSETFASTINT (XCONS (lispstream)->cdr, (EMACS_UINT)stream & 0xffff); |
341 | 612 record_unwind_protect (load_unwind, lispstream); |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
613 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
|
614 specbind (Qload_file_name, found); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
615 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
|
616 load_descriptor_list |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
617 = Fcons (make_number (fileno (stream)), load_descriptor_list); |
341 | 618 load_in_progress++; |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
619 readevalloop (Qget_file_char, stream, file, Feval, 0); |
341 | 620 unbind_to (count, Qnil); |
621 | |
622 /* Run any load-hooks for this file. */ | |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
623 temp = Fassoc (file, Vafter_load_alist); |
485 | 624 if (!NILP (temp)) |
341 | 625 Fprogn (Fcdr (temp)); |
626 UNGCPRO; | |
627 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
628 if (saved_doc_string) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
629 free (saved_doc_string); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
630 saved_doc_string = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
631 saved_doc_string_size = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
632 |
485 | 633 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
|
634 { |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
635 if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
636 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
|
637 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
638 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
|
639 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
640 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
|
641 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
|
642 } |
341 | 643 return Qt; |
644 } | |
645 | |
646 static Lisp_Object | |
647 load_unwind (stream) /* used as unwind-protect function in load */ | |
648 Lisp_Object stream; | |
649 { | |
9552
c1d477aec340
(load_unwind): Cast argument of fclose.
Richard M. Stallman <rms@gnu.org>
parents:
9466
diff
changeset
|
650 fclose ((FILE *) (XFASTINT (XCONS (stream)->car) << 16 |
c1d477aec340
(load_unwind): Cast argument of fclose.
Richard M. Stallman <rms@gnu.org>
parents:
9466
diff
changeset
|
651 | XFASTINT (XCONS (stream)->cdr))); |
341 | 652 if (--load_in_progress < 0) load_in_progress = 0; |
653 return Qnil; | |
654 } | |
655 | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
656 static Lisp_Object |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
657 load_descriptor_unwind (oldlist) |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
658 Lisp_Object oldlist; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
659 { |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
660 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
|
661 return Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
662 } |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
663 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
664 /* 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
|
665 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
|
666 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
667 void |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
668 close_load_descs () |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
669 { |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
670 #ifndef WINDOWSNT |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
671 Lisp_Object tail; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
672 for (tail = load_descriptor_list; !NILP (tail); tail = XCONS (tail)->cdr) |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
673 close (XFASTINT (XCONS (tail)->car)); |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
674 #endif |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
675 } |
341 | 676 |
677 static int | |
678 complete_filename_p (pathname) | |
679 Lisp_Object pathname; | |
680 { | |
681 register unsigned char *s = XSTRING (pathname)->data; | |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
682 return (IS_DIRECTORY_SEP (s[0]) |
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
683 || (XSTRING (pathname)->size > 2 |
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
684 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2])) |
341 | 685 #ifdef ALTOS |
686 || *s == '@' | |
687 #endif | |
688 #ifdef VMS | |
689 || index (s, ':') | |
690 #endif /* VMS */ | |
691 ); | |
692 } | |
693 | |
694 /* Search for a file whose name is STR, looking in directories | |
695 in the Lisp list PATH, and trying suffixes from SUFFIX. | |
696 SUFFIX is a string containing possible suffixes separated by colons. | |
697 On success, returns a file descriptor. On failure, returns -1. | |
698 | |
699 EXEC_ONLY nonzero means don't open the files, | |
700 just look for one that is executable. In this case, | |
701 returns 1 on success. | |
702 | |
703 If STOREPTR is nonzero, it points to a slot where the name of | |
704 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
|
705 nil is stored there on failure. |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
706 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
707 If the file we find is remote, return 0 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
708 but store the found remote file name in *STOREPTR. |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
709 We do not check for remote files if EXEC_ONLY is nonzero. */ |
341 | 710 |
711 int | |
712 openp (path, str, suffix, storeptr, exec_only) | |
713 Lisp_Object path, str; | |
714 char *suffix; | |
715 Lisp_Object *storeptr; | |
716 int exec_only; | |
717 { | |
718 register int fd; | |
719 int fn_size = 100; | |
720 char buf[100]; | |
721 register char *fn = buf; | |
722 int absolute = 0; | |
723 int want_size; | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
724 Lisp_Object filename; |
341 | 725 struct stat st; |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
726 struct gcpro gcpro1; |
341 | 727 |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
728 GCPRO1 (str); |
341 | 729 if (storeptr) |
730 *storeptr = Qnil; | |
731 | |
732 if (complete_filename_p (str)) | |
733 absolute = 1; | |
734 | |
485 | 735 for (; !NILP (path); path = Fcdr (path)) |
341 | 736 { |
737 char *nsuffix; | |
738 | |
739 filename = Fexpand_file_name (str, Fcar (path)); | |
740 if (!complete_filename_p (filename)) | |
741 /* If there are non-absolute elts in PATH (eg ".") */ | |
742 /* Of course, this could conceivably lose if luser sets | |
743 default-directory to be something non-absolute... */ | |
744 { | |
745 filename = Fexpand_file_name (filename, current_buffer->directory); | |
746 if (!complete_filename_p (filename)) | |
747 /* Give up on this path element! */ | |
748 continue; | |
749 } | |
750 | |
751 /* Calculate maximum size of any filename made from | |
752 this path element/specified file name and any possible suffix. */ | |
753 want_size = strlen (suffix) + XSTRING (filename)->size + 1; | |
754 if (fn_size < want_size) | |
755 fn = (char *) alloca (fn_size = 100 + want_size); | |
756 | |
757 nsuffix = suffix; | |
758 | |
759 /* Loop over suffixes. */ | |
760 while (1) | |
761 { | |
762 char *esuffix = (char *) index (nsuffix, ':'); | |
763 int lsuffix = esuffix ? esuffix - nsuffix : strlen (nsuffix); | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
764 Lisp_Object handler; |
341 | 765 |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
766 /* 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
|
767 If the directory starts with /:, remove that. */ |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
768 if (XSTRING (filename)->size > 2 |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
769 && XSTRING (filename)->data[0] == '/' |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
770 && XSTRING (filename)->data[1] == ':') |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
771 { |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
772 strncpy (fn, XSTRING (filename)->data + 2, |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
773 XSTRING (filename)->size - 2); |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
774 fn[XSTRING (filename)->size - 2] = 0; |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
775 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
776 else |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
777 { |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
778 strncpy (fn, XSTRING (filename)->data, XSTRING (filename)->size); |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
779 fn[XSTRING (filename)->size] = 0; |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
780 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
781 |
341 | 782 if (lsuffix != 0) /* Bug happens on CCI if lsuffix is 0. */ |
783 strncat (fn, nsuffix, lsuffix); | |
784 | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
785 /* Check that the file exists and is not a directory. */ |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
786 if (absolute) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
787 handler = Qnil; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
788 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
789 handler = Ffind_file_name_handler (filename, Qfile_exists_p); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
790 if (! NILP (handler) && ! exec_only) |
341 | 791 { |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
792 Lisp_Object string; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
793 int exists; |
341 | 794 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
795 string = build_string (fn); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
796 exists = ! NILP (exec_only ? Ffile_executable_p (string) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
797 : Ffile_readable_p (string)); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
798 if (exists |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
799 && ! NILP (Ffile_directory_p (build_string (fn)))) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
800 exists = 0; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
801 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
802 if (exists) |
341 | 803 { |
804 /* We succeeded; return this descriptor and filename. */ | |
805 if (storeptr) | |
806 *storeptr = build_string (fn); | |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
807 UNGCPRO; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
808 return 0; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
809 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
810 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
811 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
812 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
813 int exists = (stat (fn, &st) >= 0 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
814 && (st.st_mode & S_IFMT) != S_IFDIR); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
815 if (exists) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
816 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
817 /* Check that we can access or open it. */ |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
818 if (exec_only) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
819 fd = (access (fn, X_OK) == 0) ? 1 : -1; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
820 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
821 fd = open (fn, O_RDONLY, 0); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
822 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
823 if (fd >= 0) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
824 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
825 /* 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
|
826 if (storeptr) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
827 *storeptr = build_string (fn); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
828 UNGCPRO; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
829 return fd; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
830 } |
341 | 831 } |
832 } | |
833 | |
834 /* Advance to next suffix. */ | |
835 if (esuffix == 0) | |
836 break; | |
837 nsuffix += lsuffix + 1; | |
838 } | |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
839 if (absolute) |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
840 break; |
341 | 841 } |
842 | |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
843 UNGCPRO; |
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
844 return -1; |
341 | 845 } |
846 | |
847 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
848 /* 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
|
849 into the load_history variable. The details depend on whether |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
850 the source has an associated file name or not. */ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
851 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
852 static void |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
853 build_load_history (stream, source) |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
854 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
|
855 Lisp_Object source; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
856 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
857 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
|
858 register Lisp_Object tem, tem2; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
859 register int foundit, loading; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
860 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
861 /* Don't bother recording anything for preloaded files. */ |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
862 if (!NILP (Vpurify_flag)) |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
863 return; |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
864 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
865 loading = stream || !NARROWED; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
866 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
867 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
|
868 prev = Qnil; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
869 foundit = 0; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
870 while (!NILP (tail)) |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
871 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
872 tem = Fcar (tail); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
873 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
874 /* Find the feature's previous assoc list... */ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
875 if (!NILP (Fequal (source, Fcar (tem)))) |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
876 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
877 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
|
878 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
879 /* If we're loading, remove it. */ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
880 if (loading) |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
881 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
882 if (NILP (prev)) |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
883 Vload_history = Fcdr (tail); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
884 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
885 Fsetcdr (prev, Fcdr (tail)); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
886 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
887 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
888 /* 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
|
889 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
890 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
891 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
|
892 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
893 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
|
894 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
895 newelt = Fcar (tem2); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
896 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
897 if (NILP (Fmemq (newelt, tem))) |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
898 Fsetcar (tail, Fcons (Fcar (tem), |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
899 Fcons (newelt, Fcdr (tem)))); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
900 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
901 tem2 = Fcdr (tem2); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
902 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
903 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
904 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
905 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
906 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
907 prev = tail; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
908 tail = Fcdr (tail); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
909 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
910 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
911 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
912 /* If we're loading, cons the new assoc onto the front of load-history, |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
913 the most-recently-loaded position. Also do this if we didn't find |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
914 an existing member for the current source. */ |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
915 if (loading || !foundit) |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
916 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
|
917 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
|
918 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
919 |
341 | 920 Lisp_Object |
921 unreadpure () /* Used as unwind-protect function in readevalloop */ | |
922 { | |
923 read_pure = 0; | |
924 return Qnil; | |
925 } | |
926 | |
927 static void | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
928 readevalloop (readcharfun, stream, sourcename, evalfun, printflag) |
341 | 929 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
|
930 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
|
931 Lisp_Object sourcename; |
341 | 932 Lisp_Object (*evalfun) (); |
933 int printflag; | |
934 { | |
935 register int c; | |
936 register Lisp_Object val; | |
937 int count = specpdl_ptr - specpdl; | |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
938 struct gcpro gcpro1; |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
939 struct buffer *b = 0; |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
940 |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
941 if (BUFFERP (readcharfun)) |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
942 b = XBUFFER (readcharfun); |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
943 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
|
944 b = XMARKER (readcharfun)->buffer; |
341 | 945 |
946 specbind (Qstandard_input, readcharfun); | |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
947 specbind (Qcurrent_load_list, Qnil); |
341 | 948 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
949 readchar_backlog = 0; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
950 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
951 GCPRO1 (sourcename); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
952 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
953 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
|
954 |
341 | 955 while (1) |
956 { | |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
957 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
|
958 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
|
959 |
341 | 960 instream = stream; |
961 c = READCHAR; | |
962 if (c == ';') | |
963 { | |
964 while ((c = READCHAR) != '\n' && c != -1); | |
965 continue; | |
966 } | |
967 if (c < 0) break; | |
10163
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
968 |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
969 /* Ignore whitespace here, so we can detect eof. */ |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
970 if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r') |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
971 continue; |
341 | 972 |
485 | 973 if (!NILP (Vpurify_flag) && c == '(') |
341 | 974 { |
8182
94f524e0d5cd
(readevalloop): Correctly unbind the unwind protect.
Richard M. Stallman <rms@gnu.org>
parents:
8083
diff
changeset
|
975 int count1 = specpdl_ptr - specpdl; |
341 | 976 record_unwind_protect (unreadpure, Qnil); |
977 val = read_list (-1, readcharfun); | |
8182
94f524e0d5cd
(readevalloop): Correctly unbind the unwind protect.
Richard M. Stallman <rms@gnu.org>
parents:
8083
diff
changeset
|
978 unbind_to (count1, Qnil); |
341 | 979 } |
980 else | |
981 { | |
982 UNREAD (c); | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
983 read_objects = Qnil; |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
984 if (NILP (Vload_read_function)) |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
985 val = read0 (readcharfun); |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
986 else |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
987 val = call1 (Vload_read_function, readcharfun); |
341 | 988 } |
989 | |
990 val = (*evalfun) (val); | |
991 if (printflag) | |
992 { | |
993 Vvalues = Fcons (val, Vvalues); | |
994 if (EQ (Vstandard_output, Qt)) | |
995 Fprin1 (val, Qnil); | |
996 else | |
997 Fprint (val, Qnil); | |
998 } | |
999 } | |
1000 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1001 build_load_history (stream, sourcename); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1002 UNGCPRO; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1003 |
341 | 1004 unbind_to (count, Qnil); |
1005 } | |
1006 | |
1007 #ifndef standalone | |
1008 | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1009 DEFUN ("eval-buffer", Feval_buffer, Seval_buffer, 0, 3, "", |
675
85fd29f25c75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
673
diff
changeset
|
1010 "Execute the current buffer as Lisp code.\n\ |
85fd29f25c75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
673
diff
changeset
|
1011 Programs can pass two arguments, BUFFER and PRINTFLAG.\n\ |
85fd29f25c75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
673
diff
changeset
|
1012 BUFFER is the buffer to evaluate (nil means use current buffer).\n\ |
85fd29f25c75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
673
diff
changeset
|
1013 PRINTFLAG controls printing of output:\n\ |
672 | 1014 nil means discard it; anything else is stream for print.\n\ |
1015 \n\ | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1016 If the optional third argument FILENAME is non-nil,\n\ |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1017 it specifies the file name to use for `load-history'.\n\ |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1018 \n\ |
16978
71aff157cff2
(Feval_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16937
diff
changeset
|
1019 This function preserves the position of point.") |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1020 (buffer, printflag, filename) |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1021 Lisp_Object buffer, printflag, filename; |
672 | 1022 { |
1023 int count = specpdl_ptr - specpdl; | |
1024 Lisp_Object tem, buf; | |
1025 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1026 if (NILP (buffer)) |
672 | 1027 buf = Fcurrent_buffer (); |
1028 else | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1029 buf = Fget_buffer (buffer); |
673 | 1030 if (NILP (buf)) |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1031 error ("No such buffer"); |
672 | 1032 |
673 | 1033 if (NILP (printflag)) |
672 | 1034 tem = Qsymbolp; |
1035 else | |
1036 tem = printflag; | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1037 |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1038 if (NILP (filename)) |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1039 filename = XBUFFER (buf)->filename; |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1040 |
672 | 1041 specbind (Qstandard_output, tem); |
1042 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1043 BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf))); | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1044 readevalloop (buf, 0, filename, Feval, !NILP (printflag)); |
1924
21bd3a2189d3
* keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents:
1887
diff
changeset
|
1045 unbind_to (count, Qnil); |
672 | 1046 |
1047 return Qnil; | |
1048 } | |
1049 | |
1050 #if 0 | |
20024
b0626d6a3f13
Make sure that make-docfile does not see the doc string
Karl Heuer <kwzh@gnu.org>
parents:
19803
diff
changeset
|
1051 XDEFUN ("eval-current-buffer", Feval_current_buffer, Seval_current_buffer, 0, 1, "", |
341 | 1052 "Execute the current buffer as Lisp code.\n\ |
1053 Programs can pass argument PRINTFLAG which controls printing of output:\n\ | |
1054 nil means discard it; anything else is stream for print.\n\ | |
1055 \n\ | |
1056 If there is no error, point does not move. If there is an error,\n\ | |
1057 point remains at the end of the last character read from the buffer.") | |
1058 (printflag) | |
1059 Lisp_Object printflag; | |
1060 { | |
1061 int count = specpdl_ptr - specpdl; | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1062 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
|
1063 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1064 cbuf = Fcurrent_buffer () |
341 | 1065 |
485 | 1066 if (NILP (printflag)) |
341 | 1067 tem = Qsymbolp; |
1068 else | |
1069 tem = printflag; | |
1070 specbind (Qstandard_output, tem); | |
1071 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1072 SET_PT (BEGV); | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1073 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, !NILP (printflag)); |
341 | 1074 return unbind_to (count, Qnil); |
1075 } | |
672 | 1076 #endif |
341 | 1077 |
1078 DEFUN ("eval-region", Feval_region, Seval_region, 2, 3, "r", | |
1079 "Execute the region as Lisp code.\n\ | |
1080 When called from programs, expects two arguments,\n\ | |
1081 giving starting and ending indices in the current buffer\n\ | |
1082 of the text to be executed.\n\ | |
1083 Programs can pass third argument PRINTFLAG which controls output:\n\ | |
1084 nil means discard it; anything else is stream for printing it.\n\ | |
1085 \n\ | |
20406
0f0a48a69b88
(Feval_region): Doc correction (point does not move).
Karl Heuer <kwzh@gnu.org>
parents:
20298
diff
changeset
|
1086 This function does not move point.") |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1087 (start, end, printflag) |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1088 Lisp_Object start, end, printflag; |
341 | 1089 { |
1090 int count = specpdl_ptr - specpdl; | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1091 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
|
1092 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1093 cbuf = Fcurrent_buffer (); |
341 | 1094 |
485 | 1095 if (NILP (printflag)) |
341 | 1096 tem = Qsymbolp; |
1097 else | |
1098 tem = printflag; | |
1099 specbind (Qstandard_output, tem); | |
1100 | |
485 | 1101 if (NILP (printflag)) |
341 | 1102 record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
1103 record_unwind_protect (save_restriction_restore, save_restriction_save ()); | |
1104 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1105 /* This both uses start and checks its type. */ |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1106 Fgoto_char (start); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1107 Fnarrow_to_region (make_number (BEGV), 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
|
1108 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, !NILP (printflag)); |
341 | 1109 |
1110 return unbind_to (count, Qnil); | |
1111 } | |
1112 | |
1113 #endif /* standalone */ | |
1114 | |
1115 DEFUN ("read", Fread, Sread, 0, 1, 0, | |
1116 "Read one Lisp expression as text from STREAM, return as Lisp object.\n\ | |
1117 If STREAM is nil, use the value of `standard-input' (which see).\n\ | |
1118 STREAM or the value of `standard-input' may be:\n\ | |
1119 a buffer (read from point and advance it)\n\ | |
1120 a marker (read from where it points and advance it)\n\ | |
1121 a function (call it with no arguments for each character,\n\ | |
1122 call it with a char as argument to push a char back)\n\ | |
1123 a string (takes text from string, starting at the beginning)\n\ | |
1124 t (read text line using minibuffer and use it).") | |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1125 (stream) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1126 Lisp_Object stream; |
341 | 1127 { |
1128 extern Lisp_Object Fread_minibuffer (); | |
1129 | |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1130 if (NILP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1131 stream = Vstandard_input; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1132 if (EQ (stream, Qt)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1133 stream = Qread_char; |
341 | 1134 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1135 readchar_backlog = 0; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1136 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1137 read_objects = Qnil; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1138 |
341 | 1139 #ifndef standalone |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1140 if (EQ (stream, Qread_char)) |
341 | 1141 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); |
1142 #endif | |
1143 | |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1144 if (STRINGP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1145 return Fcar (Fread_from_string (stream, Qnil, Qnil)); |
341 | 1146 |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1147 return read0 (stream); |
341 | 1148 } |
1149 | |
1150 DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, | |
1151 "Read one Lisp expression which is represented as text by STRING.\n\ | |
1152 Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX).\n\ | |
1153 START and END optionally delimit a substring of STRING from which to read;\n\ | |
1154 they default to 0 and (length STRING) respectively.") | |
1155 (string, start, end) | |
1156 Lisp_Object string, start, end; | |
1157 { | |
1158 int startval, endval; | |
1159 Lisp_Object tem; | |
1160 | |
1161 CHECK_STRING (string,0); | |
1162 | |
485 | 1163 if (NILP (end)) |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
1164 endval = STRING_BYTES (XSTRING (string)); |
341 | 1165 else |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1166 { |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1167 CHECK_NUMBER (end, 2); |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1168 endval = string_char_to_byte (string, XINT (end)); |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
1169 if (endval < 0 || endval > STRING_BYTES (XSTRING (string))) |
341 | 1170 args_out_of_range (string, end); |
1171 } | |
1172 | |
485 | 1173 if (NILP (start)) |
341 | 1174 startval = 0; |
1175 else | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1176 { |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1177 CHECK_NUMBER (start, 1); |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1178 startval = string_char_to_byte (string, XINT (start)); |
341 | 1179 if (startval < 0 || startval > endval) |
1180 args_out_of_range (string, start); | |
1181 } | |
1182 | |
1183 read_from_string_index = startval; | |
1184 read_from_string_limit = endval; | |
1185 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1186 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1187 read_objects = Qnil; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1188 |
341 | 1189 tem = read0 (string); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1190 endval = string_byte_to_char (string, |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1191 read_from_string_index); |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1192 return Fcons (tem, make_number (endval)); |
341 | 1193 } |
1194 | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1195 /* 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
|
1196 are not allowed. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1197 |
341 | 1198 static Lisp_Object |
1199 read0 (readcharfun) | |
1200 Lisp_Object readcharfun; | |
1201 { | |
1202 register Lisp_Object val; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1203 int c; |
341 | 1204 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1205 val = read1 (readcharfun, &c, 0); |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1206 if (c) |
21211
293254dae80a
(read0): Swap args to Fmake_string.
Richard M. Stallman <rms@gnu.org>
parents:
20815
diff
changeset
|
1207 Fsignal (Qinvalid_read_syntax, Fcons (Fmake_string (make_number (1), |
293254dae80a
(read0): Swap args to Fmake_string.
Richard M. Stallman <rms@gnu.org>
parents:
20815
diff
changeset
|
1208 make_number (c)), |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1209 Qnil)); |
341 | 1210 |
1211 return val; | |
1212 } | |
1213 | |
1214 static int read_buffer_size; | |
1215 static char *read_buffer; | |
1216 | |
17038 | 1217 /* Read multibyte form and return it as a character. C is a first |
1218 byte of multibyte form, and rest of them are read from | |
1219 READCHARFUN. */ | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1220 |
17038 | 1221 static int |
1222 read_multibyte (c, readcharfun) | |
1223 register int c; | |
1224 Lisp_Object readcharfun; | |
1225 { | |
1226 /* We need the actual character code of this multibyte | |
1227 characters. */ | |
1228 unsigned char str[MAX_LENGTH_OF_MULTI_BYTE_FORM]; | |
1229 int len = 0; | |
1230 | |
1231 str[len++] = c; | |
1232 while ((c = READCHAR) >= 0xA0 | |
1233 && len < MAX_LENGTH_OF_MULTI_BYTE_FORM) | |
1234 str[len++] = c; | |
1235 UNREAD (c); | |
1236 return STRING_CHAR (str, len); | |
1237 } | |
1238 | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1239 /* Read a \-escape sequence, assuming we already read the `\'. */ |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1240 |
341 | 1241 static int |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1242 read_escape (readcharfun, stringp) |
341 | 1243 Lisp_Object readcharfun; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1244 int stringp; |
341 | 1245 { |
1246 register int c = READCHAR; | |
1247 switch (c) | |
1248 { | |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1249 case -1: |
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1250 error ("End of file"); |
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1251 |
341 | 1252 case 'a': |
485 | 1253 return '\007'; |
341 | 1254 case 'b': |
1255 return '\b'; | |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1256 case 'd': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1257 return 0177; |
341 | 1258 case 'e': |
1259 return 033; | |
1260 case 'f': | |
1261 return '\f'; | |
1262 case 'n': | |
1263 return '\n'; | |
1264 case 'r': | |
1265 return '\r'; | |
1266 case 't': | |
1267 return '\t'; | |
1268 case 'v': | |
1269 return '\v'; | |
1270 case '\n': | |
1271 return -1; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1272 case ' ': |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1273 if (stringp) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1274 return -1; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1275 return ' '; |
341 | 1276 |
1277 case 'M': | |
1278 c = READCHAR; | |
1279 if (c != '-') | |
1280 error ("Invalid escape character syntax"); | |
1281 c = READCHAR; | |
1282 if (c == '\\') | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1283 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1284 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
|
1285 |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1286 case 'S': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1287 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1288 if (c != '-') |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1289 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
|
1290 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1291 if (c == '\\') |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1292 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1293 return c | shift_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1294 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1295 case 'H': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1296 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1297 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1298 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1299 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1300 if (c == '\\') |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1301 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1302 return c | hyper_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1303 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1304 case 'A': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1305 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1306 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1307 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1308 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1309 if (c == '\\') |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1310 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1311 return c | alt_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1312 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1313 case 's': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1314 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1315 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1316 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1317 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1318 if (c == '\\') |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1319 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1320 return c | super_modifier; |
341 | 1321 |
1322 case 'C': | |
1323 c = READCHAR; | |
1324 if (c != '-') | |
1325 error ("Invalid escape character syntax"); | |
1326 case '^': | |
1327 c = READCHAR; | |
1328 if (c == '\\') | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1329 c = read_escape (readcharfun, 0); |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1330 if ((c & 0177) == '?') |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1331 return 0177 | c; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1332 /* 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
|
1333 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
|
1334 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
|
1335 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
|
1336 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
|
1337 return (c & (037 | ~0177)); |
341 | 1338 else |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1339 return c | ctrl_modifier; |
341 | 1340 |
1341 case '0': | |
1342 case '1': | |
1343 case '2': | |
1344 case '3': | |
1345 case '4': | |
1346 case '5': | |
1347 case '6': | |
1348 case '7': | |
1349 /* An octal escape, as in ANSI C. */ | |
1350 { | |
1351 register int i = c - '0'; | |
1352 register int count = 0; | |
1353 while (++count < 3) | |
1354 { | |
1355 if ((c = READCHAR) >= '0' && c <= '7') | |
1356 { | |
1357 i *= 8; | |
1358 i += c - '0'; | |
1359 } | |
1360 else | |
1361 { | |
1362 UNREAD (c); | |
1363 break; | |
1364 } | |
1365 } | |
1366 return i; | |
1367 } | |
1368 | |
1369 case 'x': | |
1370 /* A hex escape, as in ANSI C. */ | |
1371 { | |
1372 int i = 0; | |
1373 while (1) | |
1374 { | |
1375 c = READCHAR; | |
1376 if (c >= '0' && c <= '9') | |
1377 { | |
1378 i *= 16; | |
1379 i += c - '0'; | |
1380 } | |
1381 else if ((c >= 'a' && c <= 'f') | |
1382 || (c >= 'A' && c <= 'F')) | |
1383 { | |
1384 i *= 16; | |
1385 if (c >= 'a' && c <= 'f') | |
1386 i += c - 'a' + 10; | |
1387 else | |
1388 i += c - 'A' + 10; | |
1389 } | |
1390 else | |
1391 { | |
1392 UNREAD (c); | |
1393 break; | |
1394 } | |
1395 } | |
1396 return i; | |
1397 } | |
1398 | |
1399 default: | |
17038 | 1400 if (BASE_LEADING_CODE_P (c)) |
1401 c = read_multibyte (c, readcharfun); | |
341 | 1402 return c; |
1403 } | |
1404 } | |
1405 | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1406 /* 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
|
1407 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
|
1408 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
|
1409 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1410 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
|
1411 |
341 | 1412 static Lisp_Object |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1413 read1 (readcharfun, pch, first_in_list) |
341 | 1414 register Lisp_Object readcharfun; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1415 int *pch; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1416 int first_in_list; |
341 | 1417 { |
1418 register int c; | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1419 int uninterned_symbol = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1420 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1421 *pch = 0; |
341 | 1422 |
1423 retry: | |
1424 | |
1425 c = READCHAR; | |
1426 if (c < 0) return Fsignal (Qend_of_file, Qnil); | |
1427 | |
1428 switch (c) | |
1429 { | |
1430 case '(': | |
1431 return read_list (0, readcharfun); | |
1432 | |
1433 case '[': | |
1434 return read_vector (readcharfun); | |
1435 | |
1436 case ')': | |
1437 case ']': | |
1438 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1439 *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
|
1440 return Qnil; |
341 | 1441 } |
1442 | |
1443 case '#': | |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1444 c = READCHAR; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1445 if (c == '^') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1446 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1447 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1448 if (c == '[') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1449 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1450 Lisp_Object tmp; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1451 tmp = read_vector (readcharfun); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1452 if (XVECTOR (tmp)->size < CHAR_TABLE_STANDARD_SLOTS |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1453 || XVECTOR (tmp)->size > CHAR_TABLE_STANDARD_SLOTS + 10) |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1454 error ("Invalid size char-table"); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1455 XSETCHAR_TABLE (tmp, XCHAR_TABLE (tmp)); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1456 XCHAR_TABLE (tmp)->top = Qt; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1457 return tmp; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1458 } |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1459 else if (c == '^') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1460 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1461 c = READCHAR; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1462 if (c == '[') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1463 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1464 Lisp_Object tmp; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1465 tmp = read_vector (readcharfun); |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1466 if (XVECTOR (tmp)->size != SUB_CHAR_TABLE_STANDARD_SLOTS) |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1467 error ("Invalid size char-table"); |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1468 XSETCHAR_TABLE (tmp, XCHAR_TABLE (tmp)); |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1469 XCHAR_TABLE (tmp)->top = Qnil; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1470 return tmp; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1471 } |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1472 Fsignal (Qinvalid_read_syntax, |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1473 Fcons (make_string ("#^^", 3), Qnil)); |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1474 } |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1475 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#^", 2), Qnil)); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1476 } |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1477 if (c == '&') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1478 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1479 Lisp_Object length; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1480 length = read1 (readcharfun, pch, first_in_list); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1481 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1482 if (c == '"') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1483 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1484 Lisp_Object tmp, val; |
16925
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1485 int size_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1) |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13235
diff
changeset
|
1486 / BITS_PER_CHAR); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1487 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1488 UNREAD (c); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1489 tmp = read1 (readcharfun, pch, first_in_list); |
16925
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1490 if (size_in_chars != XSTRING (tmp)->size |
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1491 /* We used to print 1 char too many |
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1492 when the number of bits was a multiple of 8. |
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1493 Accept such input in case it came from an old version. */ |
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1494 && ! (XFASTINT (length) |
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1495 == (XSTRING (tmp)->size - 1) * BITS_PER_CHAR)) |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1496 Fsignal (Qinvalid_read_syntax, |
16856 | 1497 Fcons (make_string ("#&...", 5), Qnil)); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1498 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1499 val = Fmake_bool_vector (length, Qnil); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1500 bcopy (XSTRING (tmp)->data, XBOOL_VECTOR (val)->data, |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1501 size_in_chars); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1502 return val; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1503 } |
16856 | 1504 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5), |
16855
d10bb3a79eff
(read1): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents:
16487
diff
changeset
|
1505 Qnil)); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1506 } |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1507 if (c == '[') |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1508 { |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1509 /* 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
|
1510 build them using function calls. */ |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1511 Lisp_Object tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1512 tmp = read_vector (readcharfun); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1513 return Fmake_byte_code (XVECTOR (tmp)->size, |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1514 XVECTOR (tmp)->contents); |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1515 } |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1516 #ifdef USE_TEXT_PROPERTIES |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1517 if (c == '(') |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1518 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1519 Lisp_Object tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1520 struct gcpro gcpro1; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1521 int ch; |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1522 |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1523 /* 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
|
1524 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
|
1525 if (ch != 0 || !STRINGP (tmp)) |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1526 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil)); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1527 GCPRO1 (tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1528 /* Read the intervals and their properties. */ |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1529 while (1) |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1530 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1531 Lisp_Object beg, end, plist; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1532 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1533 beg = 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
|
1534 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
|
1535 break; |
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1536 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1537 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
|
1538 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1539 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
|
1540 if (ch) |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1541 Fsignal (Qinvalid_read_syntax, |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1542 Fcons (build_string ("invalid string property list"), |
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1543 Qnil)); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1544 Fset_text_properties (beg, end, plist, tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1545 } |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1546 UNGCPRO; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1547 return tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1548 } |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1549 #endif |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1550 /* #@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
|
1551 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
|
1552 and function definitions. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1553 if (c == '@') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1554 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1555 int i, nskip = 0; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1556 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1557 /* Read a decimal integer. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1558 while ((c = READCHAR) >= 0 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1559 && c >= '0' && c <= '9') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1560 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1561 nskip *= 10; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1562 nskip += c - '0'; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1563 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1564 if (c >= 0) |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1565 UNREAD (c); |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1566 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1567 #ifndef DOS_NT /* I don't know if filepos works right on MSDOS and Windoze. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1568 if (load_force_doc_strings && EQ (readcharfun, Qget_file_char)) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1569 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1570 /* 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
|
1571 record the last string that we skipped, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1572 and record where in the file it comes from. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1573 if (saved_doc_string_size == 0) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1574 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1575 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
|
1576 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
|
1577 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1578 if (nskip > saved_doc_string_size) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1579 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1580 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
|
1581 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
|
1582 saved_doc_string_size); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1583 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1584 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1585 saved_doc_string_position = ftell (instream); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1586 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1587 /* Copy that many characters into saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1588 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1589 saved_doc_string[i] = c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1590 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1591 saved_doc_string_length = i; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1592 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1593 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1594 #endif /* not DOS_NT */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1595 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1596 /* Skip that many characters. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1597 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1598 c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1599 } |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
1600 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1601 goto retry; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1602 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1603 if (c == '$') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1604 return Vload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
1605 if (c == '\'') |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
1606 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
|
1607 /* #: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
|
1608 if (c == ':') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1609 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1610 uninterned_symbol = 1; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1611 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1612 goto default_label; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1613 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1614 /* 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
|
1615 if (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1616 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1617 int n = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1618 Lisp_Object tem; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
1619 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1620 /* Read a non-negative integer. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1621 while (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1622 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1623 n *= 10; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1624 n += c - '0'; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1625 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1626 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1627 /* #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
|
1628 if (c == '=') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1629 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1630 tem = read0 (readcharfun); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1631 read_objects = Fcons (Fcons (make_number (n), tem), read_objects); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1632 return tem; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1633 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1634 /* #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
|
1635 if (c == '#') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1636 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1637 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
|
1638 if (CONSP (tem)) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1639 return XCDR (tem); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1640 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1641 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1642 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1643 } |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1644 |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1645 UNREAD (c); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1646 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil)); |
341 | 1647 |
1648 case ';': | |
1649 while ((c = READCHAR) >= 0 && c != '\n'); | |
1650 goto retry; | |
1651 | |
1652 case '\'': | |
1653 { | |
1654 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil)); | |
1655 } | |
1656 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1657 case '`': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1658 if (first_in_list) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1659 goto default_label; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1660 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1661 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1662 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1663 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1664 new_backquote_flag = 1; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1665 value = read0 (readcharfun); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1666 new_backquote_flag = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1667 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1668 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
|
1669 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1670 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1671 case ',': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1672 if (new_backquote_flag) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1673 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1674 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
|
1675 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1676 int ch = READCHAR; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1677 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1678 if (ch == '@') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1679 comma_type = Qcomma_at; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1680 else if (ch == '.') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1681 comma_type = Qcomma_dot; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1682 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1683 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1684 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
|
1685 comma_type = Qcomma; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1686 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1687 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1688 new_backquote_flag = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1689 value = read0 (readcharfun); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1690 new_backquote_flag = 1; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1691 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
|
1692 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1693 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1694 goto default_label; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1695 |
341 | 1696 case '?': |
1697 { | |
1698 register Lisp_Object val; | |
1699 | |
1700 c = READCHAR; | |
1701 if (c < 0) return Fsignal (Qend_of_file, Qnil); | |
1702 | |
1703 if (c == '\\') | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1704 c = read_escape (readcharfun, 0); |
17038 | 1705 else if (BASE_LEADING_CODE_P (c)) |
1706 c = read_multibyte (c, readcharfun); | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1707 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1708 return make_number (c); |
341 | 1709 } |
1710 | |
1711 case '\"': | |
1712 { | |
1713 register char *p = read_buffer; | |
1714 register char *end = read_buffer + read_buffer_size; | |
1715 register int c; | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1716 /* Nonzero if we saw an escape sequence specifying |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1717 a multibyte character. */ |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1718 int force_multibyte = 0; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1719 /* Nonzero if we saw an escape sequence specifying |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1720 a single-byte character. */ |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1721 int force_singlebyte = 0; |
341 | 1722 int cancel = 0; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1723 int nchars; |
341 | 1724 |
1725 while ((c = READCHAR) >= 0 | |
1726 && c != '\"') | |
1727 { | |
1728 if (p == end) | |
1729 { | |
1730 char *new = (char *) xrealloc (read_buffer, read_buffer_size *= 2); | |
1731 p += new - read_buffer; | |
1732 read_buffer += new - read_buffer; | |
1733 end = read_buffer + read_buffer_size; | |
1734 } | |
1735 if (c == '\\') | |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1736 { |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1737 c = read_escape (readcharfun, 1); |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1738 if (! SINGLE_BYTE_CHAR_P ((c & ~CHAR_META))) |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1739 { |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
1740 unsigned char workbuf[4]; |
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
1741 unsigned char *str = workbuf; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1742 int length; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1743 |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1744 length = non_ascii_char_to_string (c, workbuf, &str); |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1745 if (length > 1) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1746 force_multibyte = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1747 |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1748 if (p + length > end) |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1749 { |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1750 char *new = (char *) xrealloc (read_buffer, read_buffer_size *= 2); |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1751 p += new - read_buffer; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1752 read_buffer += new - read_buffer; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1753 end = read_buffer + read_buffer_size; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1754 } |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1755 |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1756 bcopy (str, p, length); |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1757 p += length; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1758 continue; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1759 } |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1760 else if (! ASCII_BYTE_P (c)) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1761 force_singlebyte = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
1762 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1763 |
341 | 1764 /* c is -1 if \ newline has just been seen */ |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1765 if (c == -1) |
341 | 1766 { |
1767 if (p == read_buffer) | |
1768 cancel = 1; | |
1769 } | |
1770 else | |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1771 { |
7144
cf47c0c11bda
(read1): Allow `\C- ' and `\C-?'.
Richard M. Stallman <rms@gnu.org>
parents:
7106
diff
changeset
|
1772 /* Allow `\C- ' and `\C-?'. */ |
cf47c0c11bda
(read1): Allow `\C- ' and `\C-?'.
Richard M. Stallman <rms@gnu.org>
parents:
7106
diff
changeset
|
1773 if (c == (CHAR_CTL | ' ')) |
cf47c0c11bda
(read1): Allow `\C- ' and `\C-?'.
Richard M. Stallman <rms@gnu.org>
parents:
7106
diff
changeset
|
1774 c = 0; |
cf47c0c11bda
(read1): Allow `\C- ' and `\C-?'.
Richard M. Stallman <rms@gnu.org>
parents:
7106
diff
changeset
|
1775 else if (c == (CHAR_CTL | '?')) |
cf47c0c11bda
(read1): Allow `\C- ' and `\C-?'.
Richard M. Stallman <rms@gnu.org>
parents:
7106
diff
changeset
|
1776 c = 127; |
cf47c0c11bda
(read1): Allow `\C- ' and `\C-?'.
Richard M. Stallman <rms@gnu.org>
parents:
7106
diff
changeset
|
1777 |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1778 if (c & CHAR_META) |
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1779 /* Move the meta bit to the right place for a string. */ |
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1780 c = (c & ~CHAR_META) | 0x80; |
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1781 if (c & ~0xff) |
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1782 error ("Invalid modifier in string"); |
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1783 *p++ = c; |
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
1784 } |
341 | 1785 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1786 if (c < 0) |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1787 return Fsignal (Qend_of_file, Qnil); |
341 | 1788 |
1789 /* If purifying, and string starts with \ newline, | |
1790 return zero instead. This is for doc strings | |
604 | 1791 that we are really going to find in etc/DOC.nn.nn */ |
485 | 1792 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) |
341 | 1793 return make_number (0); |
1794 | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1795 if (force_singlebyte && force_multibyte) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1796 error ("Multibyte and single-byte escapes in one string constant"); |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1797 |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1798 if (force_singlebyte) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1799 nchars = p - read_buffer; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1800 else if (! NILP (buffer_defaults.enable_multibyte_characters) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1801 || force_multibyte) |
21220
8cbc0182c543
(read1): Call multibyte_chars_in_text
Kenichi Handa <handa@m17n.org>
parents:
21211
diff
changeset
|
1802 nchars = multibyte_chars_in_text (read_buffer, p - read_buffer); |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1803 else |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1804 nchars = p - read_buffer; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1805 |
341 | 1806 if (read_pure) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1807 return make_pure_string (read_buffer, nchars, p - read_buffer, |
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1808 (force_multibyte |
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1809 || (p - read_buffer != nchars))); |
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1810 return make_specified_string (read_buffer, nchars, p - read_buffer, |
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1811 (force_multibyte |
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1812 || (p - read_buffer != nchars))); |
341 | 1813 } |
1814 | |
762 | 1815 case '.': |
1816 { | |
1817 #ifdef LISP_FLOAT_TYPE | |
1818 /* If a period is followed by a number, then we should read it | |
1819 as a floating point number. Otherwise, it denotes a dotted | |
1820 pair. */ | |
1821 int next_char = READCHAR; | |
1822 UNREAD (next_char); | |
1823 | |
9871 | 1824 if (! (next_char >= '0' && next_char <= '9')) |
762 | 1825 #endif |
1826 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1827 *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
|
1828 return Qnil; |
762 | 1829 } |
1830 | |
1831 /* Otherwise, we fall through! Note that the atom-reading loop | |
1832 below will now loop at least once, assuring that we will not | |
1833 try to UNREAD two characters in a row. */ | |
1834 } | |
341 | 1835 default: |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1836 default_label: |
341 | 1837 if (c <= 040) goto retry; |
1838 { | |
1839 register 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
|
1840 int quoted = 0; |
341 | 1841 |
1842 { | |
1843 register char *end = read_buffer + read_buffer_size; | |
1844 | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1845 while (c > 040 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1846 && !(c == '\"' || c == '\'' || c == ';' || c == '?' |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1847 || c == '(' || c == ')' |
762 | 1848 #ifndef LISP_FLOAT_TYPE |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1849 /* If we have floating-point support, then we need |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1850 to allow <digits><dot><digits>. */ |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1851 || c =='.' |
341 | 1852 #endif /* not LISP_FLOAT_TYPE */ |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1853 || c == '[' || c == ']' || c == '#' |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1854 )) |
341 | 1855 { |
1856 if (p == end) | |
1857 { | |
1858 register char *new = (char *) xrealloc (read_buffer, read_buffer_size *= 2); | |
1859 p += new - read_buffer; | |
1860 read_buffer += new - read_buffer; | |
1861 end = read_buffer + read_buffer_size; | |
1862 } | |
1863 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
|
1864 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1865 c = READCHAR; |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1866 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
|
1867 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1868 |
341 | 1869 *p++ = c; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1870 |
341 | 1871 c = READCHAR; |
1872 } | |
1873 | |
1874 if (p == end) | |
1875 { | |
1876 char *new = (char *) xrealloc (read_buffer, read_buffer_size *= 2); | |
1877 p += new - read_buffer; | |
1878 read_buffer += new - read_buffer; | |
1879 /* end = read_buffer + read_buffer_size; */ | |
1880 } | |
1881 *p = 0; | |
1882 if (c >= 0) | |
1883 UNREAD (c); | |
1884 } | |
1885 | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1886 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
|
1887 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1888 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
|
1889 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
|
1890 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
|
1891 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
|
1892 /* 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
|
1893 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
|
1894 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1895 while (p1 != p && (c = *p1) >= '0' && c <= '9') p1++; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1758
diff
changeset
|
1896 #ifdef LISP_FLOAT_TYPE |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1897 /* 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
|
1898 if (p1 > read_buffer && p1 < p && *p1 == '.') p1++; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1758
diff
changeset
|
1899 #endif |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1900 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
|
1901 /* 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
|
1902 { |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1758
diff
changeset
|
1903 #ifdef LISP_FLOAT_TYPE |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1904 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
|
1905 p1[-1] = '\0'; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1758
diff
changeset
|
1906 #endif |
11699
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
1907 if (sizeof (int) == sizeof (EMACS_INT)) |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
1908 XSETINT (val, atoi (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
1909 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
|
1910 XSETINT (val, atol (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
1911 else |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
1912 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
|
1913 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
|
1914 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1915 } |
341 | 1916 #ifdef LISP_FLOAT_TYPE |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1917 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
|
1918 { |
21636
10d8ced94467
(read1): Compute NaN and infinities using 0.0 in a
Richard M. Stallman <rms@gnu.org>
parents:
21635
diff
changeset
|
1919 double zero = 0.0; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1920 double value = atof (read_buffer); |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1921 if (read_buffer[0] == '-' && value == 0.0) |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1922 value *= -1.0; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1923 /* The only way this can be true, after isfloat_string |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1924 returns 1, is if the input ends in e+INF or e+NaN. */ |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1925 if (p[-1] == 'F' || p[-1] == 'N') |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1926 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1927 if (p[-1] == 'N') |
21636
10d8ced94467
(read1): Compute NaN and infinities using 0.0 in a
Richard M. Stallman <rms@gnu.org>
parents:
21635
diff
changeset
|
1928 value = zero / zero; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1929 else if (read_buffer[0] == '-') |
21636
10d8ced94467
(read1): Compute NaN and infinities using 0.0 in a
Richard M. Stallman <rms@gnu.org>
parents:
21635
diff
changeset
|
1930 value = - 1.0 / zero; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1931 else |
21636
10d8ced94467
(read1): Compute NaN and infinities using 0.0 in a
Richard M. Stallman <rms@gnu.org>
parents:
21635
diff
changeset
|
1932 value = 1.0 / zero; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1933 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1934 return make_float (value); |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1935 } |
341 | 1936 #endif |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
1937 } |
341 | 1938 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1939 if (uninterned_symbol) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1940 return make_symbol (read_buffer); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1941 else |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1942 return intern (read_buffer); |
341 | 1943 } |
1944 } | |
1945 } | |
1946 | |
1947 #ifdef LISP_FLOAT_TYPE | |
1948 | |
1949 #define LEAD_INT 1 | |
1950 #define DOT_CHAR 2 | |
1951 #define TRAIL_INT 4 | |
1952 #define E_CHAR 8 | |
1953 #define EXP_INT 16 | |
1954 | |
1955 int | |
1956 isfloat_string (cp) | |
1957 register char *cp; | |
1958 { | |
1959 register state; | |
1960 | |
1961 state = 0; | |
1962 if (*cp == '+' || *cp == '-') | |
1963 cp++; | |
1964 | |
9871 | 1965 if (*cp >= '0' && *cp <= '9') |
341 | 1966 { |
1967 state |= LEAD_INT; | |
9871 | 1968 while (*cp >= '0' && *cp <= '9') |
1969 cp++; | |
341 | 1970 } |
1971 if (*cp == '.') | |
1972 { | |
1973 state |= DOT_CHAR; | |
1974 cp++; | |
1975 } | |
9871 | 1976 if (*cp >= '0' && *cp <= '9') |
341 | 1977 { |
1978 state |= TRAIL_INT; | |
9871 | 1979 while (*cp >= '0' && *cp <= '9') |
341 | 1980 cp++; |
1981 } | |
16342
b91af71f45f1
(isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents:
16228
diff
changeset
|
1982 if (*cp == 'e' || *cp == 'E') |
341 | 1983 { |
1984 state |= E_CHAR; | |
1985 cp++; | |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
1986 if (*cp == '+' || *cp == '-') |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
1987 cp++; |
341 | 1988 } |
1989 | |
9871 | 1990 if (*cp >= '0' && *cp <= '9') |
341 | 1991 { |
1992 state |= EXP_INT; | |
9871 | 1993 while (*cp >= '0' && *cp <= '9') |
341 | 1994 cp++; |
1995 } | |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1996 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
|
1997 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1998 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
1999 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2000 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2001 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
|
2002 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2003 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2004 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2005 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2006 |
11172
e1ca77e22c12
(isfloat_string): Permit trailing space.
Richard M. Stallman <rms@gnu.org>
parents:
11079
diff
changeset
|
2007 return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) |
341 | 2008 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) |
826 | 2009 || state == (DOT_CHAR|TRAIL_INT) |
341 | 2010 || state == (LEAD_INT|E_CHAR|EXP_INT) |
826 | 2011 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT) |
2012 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT))); | |
341 | 2013 } |
2014 #endif /* LISP_FLOAT_TYPE */ | |
2015 | |
2016 static Lisp_Object | |
2017 read_vector (readcharfun) | |
2018 Lisp_Object readcharfun; | |
2019 { | |
2020 register int i; | |
2021 register int size; | |
2022 register Lisp_Object *ptr; | |
2023 register Lisp_Object tem, vector; | |
2024 register struct Lisp_Cons *otem; | |
2025 Lisp_Object len; | |
2026 | |
2027 tem = read_list (1, readcharfun); | |
2028 len = Flength (tem); | |
2029 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil)); | |
2030 | |
2031 | |
2032 size = XVECTOR (vector)->size; | |
2033 ptr = XVECTOR (vector)->contents; | |
2034 for (i = 0; i < size; i++) | |
2035 { | |
2036 ptr[i] = read_pure ? Fpurecopy (Fcar (tem)) : Fcar (tem); | |
2037 otem = XCONS (tem); | |
2038 tem = Fcdr (tem); | |
2039 free_cons (otem); | |
2040 } | |
2041 return vector; | |
2042 } | |
2043 | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2044 /* 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
|
2045 FLAG = -1 means check for starting with defun |
341 | 2046 and make structure pure. */ |
2047 | |
2048 static Lisp_Object | |
2049 read_list (flag, readcharfun) | |
2050 int flag; | |
2051 register Lisp_Object readcharfun; | |
2052 { | |
2053 /* -1 means check next element for defun, | |
2054 0 means don't check, | |
2055 1 means already checked and found defun. */ | |
2056 int defunflag = flag < 0 ? -1 : 0; | |
2057 Lisp_Object val, tail; | |
2058 register Lisp_Object elt, tem; | |
2059 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
|
2060 /* 0 is the normal case. |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2061 1 means this list is a doc reference; replace it with the number 0. |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2062 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
|
2063 int doc_reference = 0; |
341 | 2064 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2065 /* 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
|
2066 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
|
2067 |
341 | 2068 val = Qnil; |
2069 tail = Qnil; | |
2070 | |
2071 while (1) | |
2072 { | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2073 int ch; |
341 | 2074 GCPRO2 (val, tail); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2075 elt = read1 (readcharfun, &ch, first_in_list); |
341 | 2076 UNGCPRO; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2077 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2078 first_in_list = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2079 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2080 /* 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
|
2081 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
|
2082 && ! 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
|
2083 && !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
|
2084 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2085 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
|
2086 /* 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
|
2087 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
|
2088 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
|
2089 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
|
2090 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
|
2091 else |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2092 /* 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
|
2093 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
|
2094 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
|
2095 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
|
2096 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
|
2097 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
|
2098 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
|
2099 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2100 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
|
2101 && ! NILP (elt) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2102 && load_force_doc_strings) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2103 doc_reference = 2; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2104 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2105 if (ch) |
341 | 2106 { |
2107 if (flag > 0) | |
2108 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2109 if (ch == ']') |
341 | 2110 return val; |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2111 Fsignal (Qinvalid_read_syntax, |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2112 Fcons (make_string (") or . in a vector", 18), Qnil)); |
341 | 2113 } |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2114 if (ch == ')') |
341 | 2115 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
|
2116 if (ch == '.') |
341 | 2117 { |
2118 GCPRO2 (val, tail); | |
485 | 2119 if (!NILP (tail)) |
341 | 2120 XCONS (tail)->cdr = read0 (readcharfun); |
2121 else | |
2122 val = read0 (readcharfun); | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2123 read1 (readcharfun, &ch, 0); |
341 | 2124 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
|
2125 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
|
2126 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2127 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
|
2128 return make_number (0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2129 if (doc_reference == 2) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2130 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2131 /* Get a doc string from the file we are loading. |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2132 If it's in saved_doc_string, get it from there. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2133 int pos = XINT (XCONS (val)->cdr); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2134 if (pos >= saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2135 && pos < (saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2136 + saved_doc_string_length)) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2137 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2138 int start = pos - saved_doc_string_position; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2139 int from, to; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2140 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2141 /* Process quoting with ^A, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2142 and find the end of the string, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2143 which is marked with ^_ (037). */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2144 for (from = start, to = start; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2145 saved_doc_string[from] != 037;) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2146 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2147 int c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2148 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2149 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2150 c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2151 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2152 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2153 else if (c == '0') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2154 saved_doc_string[to++] = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2155 else if (c == '_') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2156 saved_doc_string[to++] = 037; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2157 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2158 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2159 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2160 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2161 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2162 return make_string (saved_doc_string + start, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2163 to - start); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2164 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2165 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2166 return read_doc_string (val); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2167 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2168 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2169 return val; |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2170 } |
341 | 2171 return Fsignal (Qinvalid_read_syntax, Fcons (make_string (". in wrong context", 18), Qnil)); |
2172 } | |
2173 return Fsignal (Qinvalid_read_syntax, Fcons (make_string ("] in a list", 11), Qnil)); | |
2174 } | |
2175 tem = (read_pure && flag <= 0 | |
2176 ? pure_cons (elt, Qnil) | |
2177 : Fcons (elt, Qnil)); | |
485 | 2178 if (!NILP (tail)) |
341 | 2179 XCONS (tail)->cdr = tem; |
2180 else | |
2181 val = tem; | |
2182 tail = tem; | |
2183 if (defunflag < 0) | |
2184 defunflag = EQ (elt, Qdefun); | |
2185 else if (defunflag > 0) | |
2186 read_pure = 1; | |
2187 } | |
2188 } | |
2189 | |
2190 Lisp_Object Vobarray; | |
2191 Lisp_Object initial_obarray; | |
2192 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2193 /* 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
|
2194 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2195 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
|
2196 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2197 static int hash_string (); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2198 Lisp_Object oblookup (); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2199 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2200 /* 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
|
2201 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
|
2202 |
341 | 2203 Lisp_Object |
2204 check_obarray (obarray) | |
2205 Lisp_Object obarray; | |
2206 { | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2207 while (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 2208 { |
2209 /* If Vobarray is now invalid, force it to be valid. */ | |
2210 if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; | |
2211 | |
2212 obarray = wrong_type_argument (Qvectorp, obarray); | |
2213 } | |
2214 return obarray; | |
2215 } | |
2216 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2217 /* 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
|
2218 interned in the current obarray. */ |
341 | 2219 |
2220 Lisp_Object | |
2221 intern (str) | |
2222 char *str; | |
2223 { | |
2224 Lisp_Object tem; | |
2225 int len = strlen (str); | |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
2226 Lisp_Object obarray; |
341 | 2227 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
2228 obarray = Vobarray; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2229 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 2230 obarray = check_obarray (obarray); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2231 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
|
2232 if (SYMBOLP (tem)) |
341 | 2233 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
|
2234 return Fintern (make_string (str, len), obarray); |
341 | 2235 } |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2236 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2237 /* 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
|
2238 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2239 Lisp_Object |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2240 make_symbol (str) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2241 char *str; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2242 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2243 int len = strlen (str); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2244 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2245 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
|
2246 ? 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
|
2247 : make_string (str, len))); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2248 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2249 |
341 | 2250 DEFUN ("intern", Fintern, Sintern, 1, 2, 0, |
2251 "Return the canonical symbol whose name is STRING.\n\ | |
2252 If there is none, one is created by this function and returned.\n\ | |
2253 A second optional argument specifies the obarray to use;\n\ | |
2254 it defaults to the value of `obarray'.") | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2255 (string, obarray) |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2256 Lisp_Object string, obarray; |
341 | 2257 { |
2258 register Lisp_Object tem, sym, *ptr; | |
2259 | |
485 | 2260 if (NILP (obarray)) obarray = Vobarray; |
341 | 2261 obarray = check_obarray (obarray); |
2262 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2263 CHECK_STRING (string, 0); |
341 | 2264 |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2265 tem = oblookup (obarray, XSTRING (string)->data, |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2266 XSTRING (string)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
2267 STRING_BYTES (XSTRING (string))); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2268 if (!INTEGERP (tem)) |
341 | 2269 return tem; |
2270 | |
485 | 2271 if (!NILP (Vpurify_flag)) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2272 string = Fpurecopy (string); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2273 sym = Fmake_symbol (string); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2274 XSYMBOL (sym)->obarray = obarray; |
341 | 2275 |
17918
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
2276 if (XSTRING (string)->data[0] == ':') |
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
2277 XSYMBOL (sym)->value = sym; |
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
2278 |
341 | 2279 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
|
2280 if (SYMBOLP (*ptr)) |
341 | 2281 XSYMBOL (sym)->next = XSYMBOL (*ptr); |
2282 else | |
2283 XSYMBOL (sym)->next = 0; | |
2284 *ptr = sym; | |
2285 return sym; | |
2286 } | |
2287 | |
2288 DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0, | |
2289 "Return the canonical symbol whose name is STRING, or nil if none exists.\n\ | |
2290 A second optional argument specifies the obarray to use;\n\ | |
2291 it defaults to the value of `obarray'.") | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2292 (string, obarray) |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2293 Lisp_Object string, obarray; |
341 | 2294 { |
2295 register Lisp_Object tem; | |
2296 | |
485 | 2297 if (NILP (obarray)) obarray = Vobarray; |
341 | 2298 obarray = check_obarray (obarray); |
2299 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2300 CHECK_STRING (string, 0); |
341 | 2301 |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2302 tem = oblookup (obarray, XSTRING (string)->data, |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2303 XSTRING (string)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
2304 STRING_BYTES (XSTRING (string))); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2305 if (!INTEGERP (tem)) |
341 | 2306 return tem; |
2307 return Qnil; | |
2308 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2309 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2310 DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0, |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2311 "Delete the symbol named NAME, if any, from OBARRAY.\n\ |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2312 The value is t if a symbol was found and deleted, nil otherwise.\n\ |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2313 NAME may be a string or a symbol. If it is a symbol, that symbol\n\ |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2314 is deleted, if it belongs to OBARRAY--no other symbol is deleted.\n\ |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2315 OBARRAY defaults to the value of the variable `obarray'.") |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2316 (name, obarray) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2317 Lisp_Object name, obarray; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2318 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2319 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
|
2320 int hash; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2321 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2322 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
|
2323 obarray = check_obarray (obarray); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2324 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2325 if (SYMBOLP (name)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2326 XSETSTRING (string, XSYMBOL (name)->name); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2327 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2328 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2329 CHECK_STRING (name, 0); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2330 string = name; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2331 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2332 |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2333 tem = oblookup (obarray, XSTRING (string)->data, |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2334 XSTRING (string)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
2335 STRING_BYTES (XSTRING (string))); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2336 if (INTEGERP (tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2337 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2338 /* 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
|
2339 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
|
2340 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2341 |
20773
6c655dc99321
(Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
2342 XSYMBOL (tem)->obarray = Qnil; |
6c655dc99321
(Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
2343 |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2344 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
|
2345 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2346 if (EQ (XVECTOR (obarray)->contents[hash], tem)) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2347 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2348 if (XSYMBOL (tem)->next) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2349 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2350 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2351 XSETINT (XVECTOR (obarray)->contents[hash], 0); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2352 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2353 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2354 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2355 Lisp_Object tail, following; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2356 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2357 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
|
2358 XSYMBOL (tail)->next; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2359 tail = following) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2360 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2361 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
|
2362 if (EQ (following, tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2363 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2364 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
|
2365 break; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2366 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2367 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2368 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2369 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2370 return Qt; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2371 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2372 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2373 /* 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
|
2374 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
|
2375 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
|
2376 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2377 Also store the bucket number in oblookup_last_bucket_number. */ |
341 | 2378 |
2379 Lisp_Object | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2380 oblookup (obarray, ptr, size, size_byte) |
341 | 2381 Lisp_Object obarray; |
2382 register char *ptr; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2383 int size, size_byte; |
341 | 2384 { |
8828 | 2385 int hash; |
2386 int obsize; | |
341 | 2387 register Lisp_Object tail; |
2388 Lisp_Object bucket, tem; | |
2389 | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2390 if (!VECTORP (obarray) |
5243 | 2391 || (obsize = XVECTOR (obarray)->size) == 0) |
341 | 2392 { |
2393 obarray = check_obarray (obarray); | |
2394 obsize = XVECTOR (obarray)->size; | |
2395 } | |
13455
4f5a9ce67782
(oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
2396 /* 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
|
2397 obsize &= ~ARRAY_MARK_FLAG; |
341 | 2398 /* Combining next two lines breaks VMS C 2.3. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2399 hash = hash_string (ptr, size_byte); |
341 | 2400 hash %= obsize; |
2401 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
|
2402 oblookup_last_bucket_number = hash; |
341 | 2403 if (XFASTINT (bucket) == 0) |
2404 ; | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2405 else if (!SYMBOLP (bucket)) |
341 | 2406 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
|
2407 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2408 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next)) |
341 | 2409 { |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
2410 if (STRING_BYTES (XSYMBOL (tail)->name) == size_byte |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2411 && XSYMBOL (tail)->name->size == size |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2412 && !bcmp (XSYMBOL (tail)->name->data, ptr, size_byte)) |
341 | 2413 return tail; |
2414 else if (XSYMBOL (tail)->next == 0) | |
2415 break; | |
2416 } | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
2417 XSETINT (tem, hash); |
341 | 2418 return tem; |
2419 } | |
2420 | |
2421 static int | |
2422 hash_string (ptr, len) | |
2423 unsigned char *ptr; | |
2424 int len; | |
2425 { | |
2426 register unsigned char *p = ptr; | |
2427 register unsigned char *end = p + len; | |
2428 register unsigned char c; | |
2429 register int hash = 0; | |
2430 | |
2431 while (p != end) | |
2432 { | |
2433 c = *p++; | |
2434 if (c >= 0140) c -= 40; | |
2435 hash = ((hash<<3) + (hash>>28) + c); | |
2436 } | |
2437 return hash & 07777777777; | |
2438 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2439 |
341 | 2440 void |
2441 map_obarray (obarray, fn, arg) | |
2442 Lisp_Object obarray; | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
2443 void (*fn) P_ ((Lisp_Object, Lisp_Object)); |
341 | 2444 Lisp_Object arg; |
2445 { | |
2446 register int i; | |
2447 register Lisp_Object tail; | |
2448 CHECK_VECTOR (obarray, 1); | |
2449 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--) | |
2450 { | |
2451 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
|
2452 if (SYMBOLP (tail)) |
341 | 2453 while (1) |
2454 { | |
2455 (*fn) (tail, arg); | |
2456 if (XSYMBOL (tail)->next == 0) | |
2457 break; | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
2458 XSETSYMBOL (tail, XSYMBOL (tail)->next); |
341 | 2459 } |
2460 } | |
2461 } | |
2462 | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
2463 void |
341 | 2464 mapatoms_1 (sym, function) |
2465 Lisp_Object sym, function; | |
2466 { | |
2467 call1 (function, sym); | |
2468 } | |
2469 | |
2470 DEFUN ("mapatoms", Fmapatoms, Smapatoms, 1, 2, 0, | |
2471 "Call FUNCTION on every symbol in OBARRAY.\n\ | |
2472 OBARRAY defaults to the value of `obarray'.") | |
2473 (function, obarray) | |
2474 Lisp_Object function, obarray; | |
2475 { | |
2476 Lisp_Object tem; | |
2477 | |
485 | 2478 if (NILP (obarray)) obarray = Vobarray; |
341 | 2479 obarray = check_obarray (obarray); |
2480 | |
2481 map_obarray (obarray, mapatoms_1, function); | |
2482 return Qnil; | |
2483 } | |
2484 | |
5117
951396781a0e
(OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents:
5017
diff
changeset
|
2485 #define OBARRAY_SIZE 1511 |
341 | 2486 |
2487 void | |
2488 init_obarray () | |
2489 { | |
2490 Lisp_Object oblength; | |
2491 int hash; | |
2492 Lisp_Object *tem; | |
2493 | |
9313
ed68c3822e4b
(read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9274
diff
changeset
|
2494 XSETFASTINT (oblength, OBARRAY_SIZE); |
341 | 2495 |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2496 Qnil = Fmake_symbol (make_pure_string ("nil", 3, 3, 0)); |
341 | 2497 Vobarray = Fmake_vector (oblength, make_number (0)); |
2498 initial_obarray = Vobarray; | |
2499 staticpro (&initial_obarray); | |
2500 /* Intern nil in the obarray */ | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2501 XSYMBOL (Qnil)->obarray = Vobarray; |
341 | 2502 /* These locals are to kludge around a pyramid compiler bug. */ |
2503 hash = hash_string ("nil", 3); | |
2504 /* Separate statement here to avoid VAXC bug. */ | |
2505 hash %= OBARRAY_SIZE; | |
2506 tem = &XVECTOR (Vobarray)->contents[hash]; | |
2507 *tem = Qnil; | |
2508 | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2509 Qunbound = Fmake_symbol (make_pure_string ("unbound", 7, 7, 0)); |
341 | 2510 XSYMBOL (Qnil)->function = Qunbound; |
2511 XSYMBOL (Qunbound)->value = Qunbound; | |
2512 XSYMBOL (Qunbound)->function = Qunbound; | |
2513 | |
2514 Qt = intern ("t"); | |
2515 XSYMBOL (Qnil)->value = Qnil; | |
2516 XSYMBOL (Qnil)->plist = Qnil; | |
2517 XSYMBOL (Qt)->value = Qt; | |
2518 | |
2519 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */ | |
2520 Vpurify_flag = Qt; | |
2521 | |
2522 Qvariable_documentation = intern ("variable-documentation"); | |
16228
fa7a56c543df
(init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents:
16165
diff
changeset
|
2523 staticpro (&Qvariable_documentation); |
341 | 2524 |
2525 read_buffer_size = 100; | |
2526 read_buffer = (char *) malloc (read_buffer_size); | |
2527 } | |
2528 | |
2529 void | |
2530 defsubr (sname) | |
2531 struct Lisp_Subr *sname; | |
2532 { | |
2533 Lisp_Object sym; | |
2534 sym = intern (sname->symbol_name); | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
2535 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 2536 } |
2537 | |
2538 #ifdef NOTDEF /* use fset in subr.el now */ | |
2539 void | |
2540 defalias (sname, string) | |
2541 struct Lisp_Subr *sname; | |
2542 char *string; | |
2543 { | |
2544 Lisp_Object sym; | |
2545 sym = intern (string); | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
2546 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 2547 } |
2548 #endif /* NOTDEF */ | |
2549 | |
2550 /* Define an "integer variable"; a symbol whose value is forwarded | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2551 to a C variable of type int. Sample call: */ |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2552 /* DEFVAR_INT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */ |
341 | 2553 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
2554 defvar_int (namestring, address) |
341 | 2555 char *namestring; |
2556 int *address; | |
2557 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2558 Lisp_Object sym, val; |
341 | 2559 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
|
2560 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2561 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
|
2562 XINTFWD (val)->intvar = address; |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2563 XSYMBOL (sym)->value = val; |
341 | 2564 } |
2565 | |
2566 /* Similar but define a variable whose value is T if address contains 1, | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2567 NIL if address contains 0 */ |
341 | 2568 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
2569 defvar_bool (namestring, address) |
341 | 2570 char *namestring; |
2571 int *address; | |
2572 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2573 Lisp_Object sym, val; |
341 | 2574 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
|
2575 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2576 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
|
2577 XBOOLFWD (val)->boolvar = address; |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2578 XSYMBOL (sym)->value = val; |
341 | 2579 } |
2580 | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2581 /* 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
|
2582 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
|
2583 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
|
2584 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
|
2585 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
|
2586 void |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2587 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
|
2588 char *namestring; |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2589 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
|
2590 { |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2591 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
|
2592 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
|
2593 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2594 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
|
2595 XOBJFWD (val)->objvar = address; |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2596 XSYMBOL (sym)->value = val; |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2597 } |
341 | 2598 |
2599 void | |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
2600 defvar_lisp (namestring, address) |
341 | 2601 char *namestring; |
2602 Lisp_Object *address; | |
2603 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2604 defvar_lisp_nopro (namestring, address); |
341 | 2605 staticpro (address); |
2606 } | |
2607 | |
2608 #ifndef standalone | |
2609 | |
2610 /* Similar but define a variable whose value is the Lisp Object stored in | |
9363
4ccd5f13788d
(defvar_per_buffer): Access buffer_local_flags as Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9361
diff
changeset
|
2611 the current buffer. address is the address of the slot in the buffer |
4ccd5f13788d
(defvar_per_buffer): Access buffer_local_flags as Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9361
diff
changeset
|
2612 that is current now. */ |
341 | 2613 |
2614 void | |
1009
bf78b5ea9b3a
* lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents:
851
diff
changeset
|
2615 defvar_per_buffer (namestring, address, type, doc) |
341 | 2616 char *namestring; |
2617 Lisp_Object *address; | |
1009
bf78b5ea9b3a
* lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents:
851
diff
changeset
|
2618 Lisp_Object type; |
341 | 2619 char *doc; |
2620 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2621 Lisp_Object sym, val; |
341 | 2622 int offset; |
2623 extern struct buffer buffer_local_symbols; | |
2624 | |
2625 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
|
2626 val = allocate_misc (); |
341 | 2627 offset = (char *)address - (char *)current_buffer; |
2628 | |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2629 XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd; |
9913
c921977bb0ce
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents:
9871
diff
changeset
|
2630 XBUFFER_OBJFWD (val)->offset = offset; |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
2631 XSYMBOL (sym)->value = val; |
341 | 2632 *(Lisp_Object *)(offset + (char *)&buffer_local_symbols) = sym; |
1009
bf78b5ea9b3a
* lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents:
851
diff
changeset
|
2633 *(Lisp_Object *)(offset + (char *)&buffer_local_types) = type; |
9363
4ccd5f13788d
(defvar_per_buffer): Access buffer_local_flags as Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9361
diff
changeset
|
2634 if (XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_flags)) == 0) |
341 | 2635 /* Did a DEFVAR_PER_BUFFER without initializing the corresponding |
2636 slot of buffer_local_flags */ | |
2637 abort (); | |
2638 } | |
2639 | |
2640 #endif /* standalone */ | |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2641 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2642 /* 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
|
2643 at a particular offset in the current kboard object. */ |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2644 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2645 void |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
2646 defvar_kboard (namestring, offset) |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2647 char *namestring; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2648 int offset; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2649 { |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2650 Lisp_Object sym, val; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2651 sym = intern (namestring); |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2652 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2653 XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd; |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
2654 XKBOARD_OBJFWD (val)->offset = offset; |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2655 XSYMBOL (sym)->value = val; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
2656 } |
341 | 2657 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
2658 /* 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
|
2659 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
|
2660 static Lisp_Object dump_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
2661 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
2662 void |
364 | 2663 init_lread () |
341 | 2664 { |
617 | 2665 char *normal; |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2666 int turn_off_warning = 0; |
341 | 2667 |
14945
4cd74c2aca79
(init_lread): Specify LC_NUMERIC locale.
Richard M. Stallman <rms@gnu.org>
parents:
14483
diff
changeset
|
2668 #ifdef HAVE_SETLOCALE |
4cd74c2aca79
(init_lread): Specify LC_NUMERIC locale.
Richard M. Stallman <rms@gnu.org>
parents:
14483
diff
changeset
|
2669 /* Make sure numbers are parsed as we expect. */ |
4cd74c2aca79
(init_lread): Specify LC_NUMERIC locale.
Richard M. Stallman <rms@gnu.org>
parents:
14483
diff
changeset
|
2670 setlocale (LC_NUMERIC, "C"); |
4cd74c2aca79
(init_lread): Specify LC_NUMERIC locale.
Richard M. Stallman <rms@gnu.org>
parents:
14483
diff
changeset
|
2671 #endif /* HAVE_SETLOCALE */ |
4cd74c2aca79
(init_lread): Specify LC_NUMERIC locale.
Richard M. Stallman <rms@gnu.org>
parents:
14483
diff
changeset
|
2672 |
364 | 2673 /* Compute the default load-path. */ |
617 | 2674 #ifdef CANNOT_DUMP |
2675 normal = PATH_LOADSEARCH; | |
638 | 2676 Vload_path = decode_env_path (0, normal); |
617 | 2677 #else |
2678 if (NILP (Vpurify_flag)) | |
2679 normal = PATH_LOADSEARCH; | |
2680 else | |
2681 normal = PATH_DUMPLOADSEARCH; | |
2682 | |
2683 /* In a dumped Emacs, we normally have to reset the value of | |
2684 Vload_path from PATH_LOADSEARCH, since the value that was dumped | |
2685 uses ../lisp, instead of the path of the installed elisp | |
2686 libraries. However, if it appears that Vload_path was changed | |
2687 from the default before dumping, don't override that value. */ | |
621 | 2688 if (initialized) |
2689 { | |
2690 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
|
2691 { |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
2692 Vload_path = decode_env_path (0, normal); |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
2693 if (!NILP (Vinstallation_directory)) |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
2694 { |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
2695 /* 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
|
2696 installation dir, if it exists. */ |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
2697 Lisp_Object tem, tem1; |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
2698 tem = Fexpand_file_name (build_string ("lisp"), |
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
2699 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
|
2700 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
|
2701 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
|
2702 { |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
2703 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
|
2704 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2705 turn_off_warning = 1; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2706 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2707 } |
7004
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
2708 } |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
2709 else |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
2710 /* 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
|
2711 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
|
2712 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
|
2713 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2714 /* 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
|
2715 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
|
2716 Vinstallation_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2717 tem1 = Ffile_exists_p (tem); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2718 if (!NILP (tem1)) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2719 { |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2720 if (NILP (Fmember (tem, Vload_path))) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2721 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2722 } |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2723 |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2724 /* Add site-list under the installation dir, if it exists. */ |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2725 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
|
2726 Vinstallation_directory); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2727 tem1 = Ffile_exists_p (tem); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2728 if (!NILP (tem1)) |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2729 { |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2730 if (NILP (Fmember (tem, Vload_path))) |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2731 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
2732 } |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2733 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2734 /* 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
|
2735 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
|
2736 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
|
2737 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2738 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
|
2739 { |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
2740 Lisp_Object tem2; |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
2741 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2742 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
|
2743 Vinstallation_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2744 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
|
2745 |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
2746 /* 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
|
2747 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
|
2748 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
|
2749 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
|
2750 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
|
2751 Vinstallation_directory); |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
2752 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
|
2753 if (!NILP (tem1) && NILP (tem2)) |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2754 { |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2755 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
|
2756 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2757 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2758 if (NILP (Fmember (tem, Vload_path))) |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2759 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2760 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2761 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
|
2762 Vsource_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2763 |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2764 if (NILP (Fmember (tem, Vload_path))) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2765 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
2766 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2767 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
|
2768 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2769 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2770 if (NILP (Fmember (tem, Vload_path))) |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2771 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2772 } |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
2773 } |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
2774 } |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
2775 } |
621 | 2776 } |
2777 else | |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
2778 { |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
2779 /* 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
|
2780 /* 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
|
2781 that caused trouble because it was copied from dump_path |
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
2782 into Vload_path, aboe, when Vinstallation_directory was non-nil. |
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
2783 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
|
2784 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
|
2785 dump_path = Vload_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
2786 } |
364 | 2787 #endif |
2788 | |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
2789 #ifndef WINDOWSNT |
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
2790 /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is |
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
2791 almost never correct, thereby causing a warning to be printed out that |
14036 | 2792 confuses users. Since PATH_LOADSEARCH is always overridden by the |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
2793 EMACSLOADPATH environment variable below, disable the warning on NT. */ |
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
2794 |
341 | 2795 /* 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
|
2796 if (!turn_off_warning) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2797 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2798 Lisp_Object path_tail; |
341 | 2799 |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2800 for (path_tail = Vload_path; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2801 !NILP (path_tail); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2802 path_tail = XCONS (path_tail)->cdr) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2803 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2804 Lisp_Object dirfile; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2805 dirfile = Fcar (path_tail); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2806 if (STRINGP (dirfile)) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2807 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2808 dirfile = Fdirectory_file_name (dirfile); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2809 if (access (XSTRING (dirfile)->data, 0) < 0) |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2810 dir_warning ("Warning: Lisp directory `%s' does not exist.\n", |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2811 XCONS (path_tail)->car); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2812 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2813 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2814 } |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
2815 #endif /* WINDOWSNT */ |
617 | 2816 |
2817 /* If the EMACSLOADPATH environment variable is set, use its value. | |
2818 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
|
2819 #ifndef CANNOT_DUMP |
617 | 2820 if (NILP (Vpurify_flag) |
2821 && egetenv ("EMACSLOADPATH")) | |
11955
d972c95e7577
(init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11868
diff
changeset
|
2822 #endif |
364 | 2823 Vload_path = decode_env_path ("EMACSLOADPATH", normal); |
2824 | |
2825 Vvalues = Qnil; | |
2826 | |
341 | 2827 load_in_progress = 0; |
15283
b2be450a8da4
(init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
15091
diff
changeset
|
2828 Vload_file_name = Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
2829 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
2830 load_descriptor_list = Qnil; |
21291
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
2831 |
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
2832 Vstandard_input = Qt; |
341 | 2833 } |
2834 | |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2835 /* Print a warning, using format string FORMAT, that directory DIRNAME |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2836 does not exist. Print it on stderr and put it in *Message*. */ |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2837 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
2838 void |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2839 dir_warning (format, dirname) |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2840 char *format; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2841 Lisp_Object dirname; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2842 { |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2843 char *buffer |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2844 = (char *) alloca (XSTRING (dirname)->size + strlen (format) + 5); |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2845 |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2846 fprintf (stderr, format, XSTRING (dirname)->data); |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2847 sprintf (buffer, format, XSTRING (dirname)->data); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2848 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
|
2849 } |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
2850 |
341 | 2851 void |
364 | 2852 syms_of_lread () |
341 | 2853 { |
2854 defsubr (&Sread); | |
2855 defsubr (&Sread_from_string); | |
2856 defsubr (&Sintern); | |
2857 defsubr (&Sintern_soft); | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2858 defsubr (&Sunintern); |
341 | 2859 defsubr (&Sload); |
672 | 2860 defsubr (&Seval_buffer); |
341 | 2861 defsubr (&Seval_region); |
2862 defsubr (&Sread_char); | |
2863 defsubr (&Sread_char_exclusive); | |
2864 defsubr (&Sread_event); | |
2865 defsubr (&Sget_file_char); | |
2866 defsubr (&Smapatoms); | |
2867 | |
2868 DEFVAR_LISP ("obarray", &Vobarray, | |
2869 "Symbol table for use by `intern' and `read'.\n\ | |
2870 It is a vector whose length ought to be prime for best results.\n\ | |
2871 The vector's contents don't make sense if examined from Lisp programs;\n\ | |
2872 to find all the symbols in an obarray, use `mapatoms'."); | |
2873 | |
2874 DEFVAR_LISP ("values", &Vvalues, | |
2875 "List of values of all expressions which were read, evaluated and printed.\n\ | |
2876 Order is reverse chronological."); | |
2877 | |
2878 DEFVAR_LISP ("standard-input", &Vstandard_input, | |
2879 "Stream for read to get input from.\n\ | |
2880 See documentation of `read' for possible values."); | |
2881 Vstandard_input = Qt; | |
2882 | |
2883 DEFVAR_LISP ("load-path", &Vload_path, | |
2884 "*List of directories to search for files to load.\n\ | |
2885 Each element is a string (directory name) or nil (try default directory).\n\ | |
2886 Initialized based on EMACSLOADPATH environment variable, if any,\n\ | |
1887
ab56990c27c4
(syms_of_lread): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1827
diff
changeset
|
2887 otherwise to default specified by file `paths.h' when Emacs was built."); |
341 | 2888 |
2889 DEFVAR_BOOL ("load-in-progress", &load_in_progress, | |
2890 "Non-nil iff inside of `load'."); | |
2891 | |
2892 DEFVAR_LISP ("after-load-alist", &Vafter_load_alist, | |
2893 "An alist of expressions to be evalled when particular files are loaded.\n\ | |
2894 Each element looks like (FILENAME FORMS...).\n\ | |
2895 When `load' is run and the file-name argument is FILENAME,\n\ | |
2896 the FORMS in the corresponding element are executed at the end of loading.\n\n\ | |
2897 FILENAME must match exactly! Normally FILENAME is the name of a library,\n\ | |
2898 with no directory specified, since that is how `load' is normally called.\n\ | |
2899 An error in FORMS does not undo the load,\n\ | |
2900 but does prevent execution of the rest of the FORMS."); | |
2901 Vafter_load_alist = Qnil; | |
2902 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
2903 DEFVAR_LISP ("load-history", &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
|
2904 "Alist mapping source file names to symbols and features.\n\ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
2905 Each alist element is a list that starts with a file name,\n\ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
2906 except for one element (optional) that starts with nil and describes\n\ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
2907 definitions evaluated from buffers not visiting files.\n\ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
2908 The remaining elements of each list are symbols defined as functions\n\ |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
2909 or variables, and cons cells `(provide . FEATURE)' and `(require . FEATURE)'."); |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
2910 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
|
2911 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2912 DEFVAR_LISP ("load-file-name", &Vload_file_name, |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2913 "Full name of file being loaded by `load'."); |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2914 Vload_file_name = Qnil; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2915 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
2916 DEFVAR_LISP ("current-load-list", &Vcurrent_load_list, |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
2917 "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
|
2918 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
|
2919 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
2920 DEFVAR_LISP ("load-read-function", &Vload_read_function, |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
2921 "Function used by `load' and `eval-region' for reading expressions.\n\ |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
2922 The default is nil, which means use the function `read'."); |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
2923 Vload_read_function = Qnil; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
2924 |
17038 | 2925 DEFVAR_LISP ("load-source-file-function", &Vload_source_file_function, |
2926 "Function called in `load' for loading an Emacs lisp source file.\n\ | |
2927 This function is for doing code conversion before reading the source file.\n\ | |
2928 If nil, loading is done without any code conversion.\n\ | |
2929 Arguments are FULLNAME, FILE, NOERROR, NOMESSAGE, where\n\ | |
2930 FULLNAME is the full name of FILE.\n\ | |
2931 See `load' for the meaning of the remaining arguments."); | |
2932 Vload_source_file_function = Qnil; | |
2933 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2934 DEFVAR_BOOL ("load-force-doc-strings", &load_force_doc_strings, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2935 "Non-nil means `load' should force-load all dynamic doc strings.\n\ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2936 This is useful when the file being loaded is a temporary copy."); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2937 load_force_doc_strings = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2938 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
2939 DEFVAR_LISP ("source-directory", &Vsource_directory, |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
2940 "Directory in which Emacs sources were found when Emacs was built.\n\ |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
2941 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
|
2942 Vsource_directory |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2943 = Fexpand_file_name (build_string ("../"), |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2944 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH))); |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2945 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
2946 DEFVAR_LISP ("preloaded-file-list", &Vpreloaded_file_list, |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
2947 "List of files that were preloaded (when dumping Emacs)."); |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
2948 Vpreloaded_file_list = Qnil; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
2949 |
14300
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2950 /* Vsource_directory was initialized in init_lread. */ |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2951 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
2952 load_descriptor_list = Qnil; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
2953 staticpro (&load_descriptor_list); |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
2954 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
2955 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
|
2956 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
|
2957 |
341 | 2958 Qstandard_input = intern ("standard-input"); |
2959 staticpro (&Qstandard_input); | |
2960 | |
2961 Qread_char = intern ("read-char"); | |
2962 staticpro (&Qread_char); | |
2963 | |
2964 Qget_file_char = intern ("get-file-char"); | |
2965 staticpro (&Qget_file_char); | |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2966 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2967 Qbackquote = intern ("`"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2968 staticpro (&Qbackquote); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2969 Qcomma = intern (","); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2970 staticpro (&Qcomma); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2971 Qcomma_at = intern (",@"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2972 staticpro (&Qcomma_at); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2973 Qcomma_dot = intern (",."); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2974 staticpro (&Qcomma_dot); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2975 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
2976 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
|
2977 staticpro (&Qinhibit_file_name_operation); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
2978 |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2979 Qascii_character = intern ("ascii-character"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2980 staticpro (&Qascii_character); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
2981 |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2982 Qfunction = intern ("function"); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2983 staticpro (&Qfunction); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2984 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
2985 Qload = intern ("load"); |
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
2986 staticpro (&Qload); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2987 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2988 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
|
2989 staticpro (&Qload_file_name); |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
2990 |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
2991 staticpro (&dump_path); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2992 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2993 staticpro (&read_objects); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2994 read_objects = Qnil; |
341 | 2995 } |