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