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