Mercurial > emacs
annotate src/lread.c @ 44443:9e6f2afa9f19
(sgml-comment-indent-new-line): New fun.
(sgml-mode): Use it for comment-line-break-function.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 08 Apr 2002 21:32:05 +0000 |
parents | 885bedb3a37b |
children | a3bd03ed0409 |
rev | line source |
---|---|
341 | 1 /* Lisp parsing and input streams. |
36256
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 2000, 2001 |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3 Free Software Foundation, Inc. |
341 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
617 | 9 the Free Software Foundation; either version 2, or (at your option) |
341 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14130
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14130
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
341 | 21 |
22 | |
7898 | 23 #include <config.h> |
341 | 24 #include <stdio.h> |
25 #include <sys/types.h> | |
26 #include <sys/stat.h> | |
27 #include <sys/file.h> | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
28 #include <errno.h> |
341 | 29 #include "lisp.h" |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
30 #include "intervals.h" |
341 | 31 #include "buffer.h" |
17038 | 32 #include "charset.h" |
24412
d11ac02f9d6a
Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents:
23933
diff
changeset
|
33 #include <epaths.h> |
341 | 34 #include "commands.h" |
1591
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
35 #include "keyboard.h" |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
36 #include "termhooks.h" |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
37 #include "coding.h" |
341 | 38 |
39 #ifdef lint | |
40 #include <sys/inode.h> | |
41 #endif /* lint */ | |
42 | |
14972
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
43 #ifdef MSDOS |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
44 #if __DJGPP__ < 2 |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
45 #include <unistd.h> /* to get X_OK */ |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
46 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
47 #include "msdos.h" |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
48 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
49 |
21799 | 50 #ifdef HAVE_UNISTD_H |
51 #include <unistd.h> | |
52 #endif | |
53 | |
341 | 54 #ifndef X_OK |
55 #define X_OK 01 | |
56 #endif | |
57 | |
58 #include <math.h> | |
59 | |
14950 | 60 #ifdef HAVE_SETLOCALE |
61 #include <locale.h> | |
62 #endif /* HAVE_SETLOCALE */ | |
63 | |
8596 | 64 #ifndef O_RDONLY |
65 #define O_RDONLY 0 | |
66 #endif | |
67 | |
34428
b2ec0cbfd60a
(file_offset, file_tell): Depend on HAVE_FSEEKO, not
Gerd Moellmann <gerd@gnu.org>
parents:
34362
diff
changeset
|
68 #ifdef HAVE_FSEEKO |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
69 #define file_offset off_t |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
70 #define file_tell ftello |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
71 #else |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
72 #define file_offset long |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
73 #define file_tell ftell |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
74 #endif |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
75 |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
76 #ifndef USE_CRT_DLL |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
77 extern int errno; |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
78 #endif |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
79 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
80 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; |
341 | 81 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
|
82 Lisp_Object Qascii_character, Qload, Qload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
83 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
|
84 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
|
85 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
86 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
|
87 extern Lisp_Object Qfile_exists_p; |
341 | 88 |
89 /* non-zero if inside `load' */ | |
90 int load_in_progress; | |
91 | |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
92 /* Directory in which the sources were found. */ |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
93 Lisp_Object Vsource_directory; |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
94 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
95 /* Search path and suffixes for files to be loaded. */ |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
96 Lisp_Object Vload_path, Vload_suffixes, default_suffixes; |
341 | 97 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
98 /* File name of user's init file. */ |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
99 Lisp_Object Vuser_init_file; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
100 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
101 /* 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
|
102 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
|
103 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
|
104 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
105 /* 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
|
106 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
|
107 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
108 /* List of files that were preloaded. */ |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
109 Lisp_Object Vpreloaded_file_list; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
110 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
111 /* 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
|
112 Lisp_Object Vload_file_name; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
113 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
114 /* 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
|
115 Lisp_Object Vload_read_function; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
116 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
117 /* 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
|
118 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
|
119 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
|
120 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
|
121 Lisp_Object read_objects; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
122 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
123 /* 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
|
124 static int load_force_doc_strings; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
125 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
126 /* Nonzero means read should convert strings to unibyte. */ |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
127 static int load_convert_to_unibyte; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
128 |
17038 | 129 /* Function to use for loading an Emacs lisp source file (not |
130 compiled) instead of readevalloop. */ | |
131 Lisp_Object Vload_source_file_function; | |
132 | |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
133 /* List of all DEFVAR_BOOL variables. Used by the byte optimizer. */ |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
134 Lisp_Object Vbyte_boolean_vars; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
135 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
136 /* 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
|
137 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
|
138 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
139 /* File for get_file_char to read from. Use by load. */ |
341 | 140 static FILE *instream; |
141 | |
142 /* When nonzero, read conses in pure space */ | |
143 static int read_pure; | |
144 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
145 /* For use within read-from-string (this reader is non-reentrant!!) */ |
341 | 146 static int read_from_string_index; |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
147 static int read_from_string_index_byte; |
341 | 148 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
|
149 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
150 /* Number of bytes left to read in the buffer character |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
151 that `readchar' has already advanced over. */ |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
152 static int readchar_backlog; |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
153 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
154 /* This contains the last string skipped with #@. */ |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
155 static char *saved_doc_string; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
156 /* Length of buffer allocated in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
157 static int saved_doc_string_size; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
158 /* Length of actual data in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
159 static int saved_doc_string_length; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
160 /* This is the file position that string came from. */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
161 static file_offset saved_doc_string_position; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
162 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
163 /* This contains the previous string skipped with #@. |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
164 We copy it from saved_doc_string when a new string |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
165 is put in saved_doc_string. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
166 static char *prev_saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
167 /* Length of buffer allocated in prev_saved_doc_string. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
168 static int prev_saved_doc_string_size; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
169 /* Length of actual data in prev_saved_doc_string. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
170 static int prev_saved_doc_string_length; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
171 /* This is the file position that string came from. */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
172 static file_offset prev_saved_doc_string_position; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
173 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
174 /* 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
|
175 with no surrounding parentheses. |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
176 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
|
177 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
|
178 static int new_backquote_flag; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
179 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
180 /* A list of file names for files being loaded in Fload. Used to |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
181 check for recursive loads. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
182 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
183 static Lisp_Object Vloads_in_progress; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
184 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
185 /* Non-zero means load dangerous compiled Lisp files. */ |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
186 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
187 int load_dangerous_libraries; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
188 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
189 /* A regular expression used to detect files compiled with Emacs. */ |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
190 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
191 static Lisp_Object Vbytecomp_version_regexp; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
192 |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
193 static void to_multibyte P_ ((char **, char **, int *)); |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
194 static void readevalloop P_ ((Lisp_Object, FILE*, Lisp_Object, |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
195 Lisp_Object (*) (), int, |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
196 Lisp_Object, Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
197 static Lisp_Object load_unwind P_ ((Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
198 static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
199 |
341 | 200 |
201 /* Handle unreading and rereading of characters. | |
202 Write READCHAR to read a character, | |
17038 | 203 UNREAD(c) to unread c to be read again. |
204 | |
205 These macros actually read/unread a byte code, multibyte characters | |
206 are not handled here. The caller should manage them if necessary. | |
207 */ | |
341 | 208 |
209 #define READCHAR readchar (readcharfun) | |
210 #define UNREAD(c) unreadchar (readcharfun, c) | |
211 | |
212 static int | |
213 readchar (readcharfun) | |
214 Lisp_Object readcharfun; | |
215 { | |
216 Lisp_Object tem; | |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
217 register int c; |
341 | 218 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
219 if (BUFFERP (readcharfun)) |
341 | 220 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
221 register struct buffer *inbuffer = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
222 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
223 int pt_byte = BUF_PT_BYTE (inbuffer); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
224 int orig_pt_byte = pt_byte; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
225 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
226 if (readchar_backlog > 0) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
227 /* We get the address of the byte just passed, |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
228 which is the last byte of the character. |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
229 The other bytes in this character are consecutive with it, |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
230 because the gap can't be in the middle of a character. */ |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
231 return *(BUF_BYTE_ADDRESS (inbuffer, BUF_PT_BYTE (inbuffer) - 1) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
232 - --readchar_backlog); |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
233 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
234 if (pt_byte >= BUF_ZV_BYTE (inbuffer)) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
235 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
236 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
237 readchar_backlog = -1; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
238 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
239 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
240 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
241 /* Fetch the character code from the buffer. */ |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
242 unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, pt_byte); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
243 BUF_INC_POS (inbuffer, pt_byte); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
244 c = STRING_CHAR (p, pt_byte - orig_pt_byte); |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
245 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
246 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
247 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
248 c = BUF_FETCH_BYTE (inbuffer, pt_byte); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
249 pt_byte++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
250 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
251 SET_BUF_PT_BOTH (inbuffer, BUF_PT (inbuffer) + 1, pt_byte); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
252 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
253 return c; |
341 | 254 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
255 if (MARKERP (readcharfun)) |
341 | 256 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
257 register struct buffer *inbuffer = XMARKER (readcharfun)->buffer; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
258 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
259 int bytepos = marker_byte_position (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
260 int orig_bytepos = bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
261 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
262 if (readchar_backlog > 0) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
263 /* We get the address of the byte just passed, |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
264 which is the last byte of the character. |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
265 The other bytes in this character are consecutive with it, |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
266 because the gap can't be in the middle of a character. */ |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
267 return *(BUF_BYTE_ADDRESS (inbuffer, XMARKER (readcharfun)->bytepos - 1) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
268 - --readchar_backlog); |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
269 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
270 if (bytepos >= BUF_ZV_BYTE (inbuffer)) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
271 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
272 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
273 readchar_backlog = -1; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
274 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
275 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
276 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
277 /* Fetch the character code from the buffer. */ |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
278 unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, bytepos); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
279 BUF_INC_POS (inbuffer, bytepos); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
280 c = STRING_CHAR (p, bytepos - orig_bytepos); |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
281 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
282 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
283 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
284 c = BUF_FETCH_BYTE (inbuffer, bytepos); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
285 bytepos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
286 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
287 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
288 XMARKER (readcharfun)->bytepos = bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
289 XMARKER (readcharfun)->charpos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
290 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
291 return c; |
341 | 292 } |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
293 |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
294 if (EQ (readcharfun, Qlambda)) |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
295 return read_bytecode_char (0); |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
296 |
341 | 297 if (EQ (readcharfun, Qget_file_char)) |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
298 { |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
299 c = getc (instream); |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
300 #ifdef EINTR |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
301 /* 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
|
302 while (c == EOF && ferror (instream) && errno == EINTR) |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
303 { |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
304 clearerr (instream); |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
305 c = getc (instream); |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
306 } |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
307 #endif |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
308 return c; |
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
309 } |
341 | 310 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
311 if (STRINGP (readcharfun)) |
341 | 312 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
313 if (read_from_string_index >= read_from_string_limit) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
314 c = -1; |
29014
4c02859dda27
(read1): On reading multibyte string, be sure to make
Kenichi Handa <handa@m17n.org>
parents:
28746
diff
changeset
|
315 else |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
316 FETCH_STRING_CHAR_ADVANCE (c, readcharfun, |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
317 read_from_string_index, |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
318 read_from_string_index_byte); |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
319 |
341 | 320 return c; |
321 } | |
322 | |
323 tem = call0 (readcharfun); | |
324 | |
485 | 325 if (NILP (tem)) |
341 | 326 return -1; |
327 return XINT (tem); | |
328 } | |
329 | |
330 /* Unread the character C in the way appropriate for the stream READCHARFUN. | |
331 If the stream is a user function, call it with the char as argument. */ | |
332 | |
333 static void | |
334 unreadchar (readcharfun, c) | |
335 Lisp_Object readcharfun; | |
336 int c; | |
337 { | |
6471
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
338 if (c == -1) |
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
339 /* 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
|
340 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
|
341 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
342 else if (BUFFERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
343 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
344 struct buffer *b = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
345 int bytepos = BUF_PT_BYTE (b); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
346 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
347 if (readchar_backlog >= 0) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
348 readchar_backlog++; |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
349 else |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
350 { |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
351 BUF_PT (b)--; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
352 if (! NILP (b->enable_multibyte_characters)) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
353 BUF_DEC_POS (b, bytepos); |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
354 else |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
355 bytepos--; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
356 |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
357 BUF_PT_BYTE (b) = bytepos; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
358 } |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
359 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
360 else if (MARKERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
361 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
362 struct buffer *b = XMARKER (readcharfun)->buffer; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
363 int bytepos = XMARKER (readcharfun)->bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
364 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
365 if (readchar_backlog >= 0) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
366 readchar_backlog++; |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
367 else |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
368 { |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
369 XMARKER (readcharfun)->charpos--; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
370 if (! NILP (b->enable_multibyte_characters)) |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
371 BUF_DEC_POS (b, bytepos); |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
372 else |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
373 bytepos--; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
374 |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
375 XMARKER (readcharfun)->bytepos = bytepos; |
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
376 } |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
377 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
378 else if (STRINGP (readcharfun)) |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
379 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
380 read_from_string_index--; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
381 read_from_string_index_byte |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
382 = string_char_to_byte (readcharfun, read_from_string_index); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
383 } |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
384 else if (EQ (readcharfun, Qlambda)) |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
385 read_bytecode_char (1); |
341 | 386 else if (EQ (readcharfun, Qget_file_char)) |
387 ungetc (c, instream); | |
388 else | |
389 call1 (readcharfun, make_number (c)); | |
390 } | |
391 | |
392 static Lisp_Object read0 (), read1 (), read_list (), read_vector (); | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
393 static int read_multibyte (); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
394 static Lisp_Object substitute_object_recurse (); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
395 static void substitute_object_in_subtree (), substitute_in_interval (); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
396 |
341 | 397 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
398 /* Get a character from the tty. */ |
341 | 399 |
1519
5d0837ebee9c
* lread.c (read_char): Add an extern declaration for this,
Jim Blandy <jimb@redhat.com>
parents:
1092
diff
changeset
|
400 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
|
401 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
402 /* 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
|
403 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
404 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
|
405 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
|
406 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
|
407 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
408 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
|
409 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
|
410 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
|
411 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
412 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
|
413 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
|
414 ASCII_REQUIRED is non-zero, we just re-read until we get an ASCII |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
415 character. |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
416 |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
417 If INPUT_METHOD is nonzero, we invoke the current input method |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
418 if the character warrants that. */ |
14483
7f49c41db1e8
(Fread_char_exclusive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14300
diff
changeset
|
419 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
420 Lisp_Object |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
421 read_filtered_event (no_switch_frame, ascii_required, error_nonascii, |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
422 input_method) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
423 int no_switch_frame, ascii_required, error_nonascii, input_method; |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
424 { |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
425 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
|
426 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
427 #ifdef HAVE_WINDOW_SYSTEM |
36256
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
428 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
429 cancel_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
430 #endif |
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
431 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
432 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
|
433 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
434 /* 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
|
435 retry: |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
436 val = read_char (0, 0, 0, |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
437 (input_method ? Qnil : Qt), |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
438 0); |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
439 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
440 if (BUFFERP (val)) |
5888
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
441 goto retry; |
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
442 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
443 /* switch-frame events are put off until after the next ASCII |
14036 | 444 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
|
445 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
|
446 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
|
447 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
|
448 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
|
449 && 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
|
450 && 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
|
451 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
452 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
|
453 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
454 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
455 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
456 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
|
457 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
458 /* 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
|
459 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
|
460 { |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
461 Lisp_Object tem, tem1; |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
462 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
|
463 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
|
464 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
465 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
|
466 /* 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
|
467 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
|
468 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
|
469 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
|
470 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
471 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
472 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
473 /* 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
|
474 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
|
475 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
476 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
|
477 { |
7106
06542cc6ddcd
(read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
478 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
|
479 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
|
480 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
481 else |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
482 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
483 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
484 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
485 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
486 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
|
487 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
|
488 |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
489 #if 0 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
490 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
491 #ifdef HAVE_WINDOW_SYSTEM |
36256
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
492 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
493 start_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
494 #endif |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
495 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
496 #endif |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
497 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
498 return val; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
499 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
500 |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
501 DEFUN ("read-char", Fread_char, Sread_char, 0, 2, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
502 doc: /* Read a character from the command input (keyboard or macro). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
503 It is returned as a number. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
504 If the user generates an event which is not a character (i.e. a mouse |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
505 click or function key event), `read-char' signals an error. As an |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
506 exception, switch-frame events are put off until non-ASCII events can |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
507 be read. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
508 If you want to read non-character events, or ignore them, call |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
509 `read-event' or `read-char-exclusive' instead. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
510 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
511 If the optional argument PROMPT is non-nil, display that as a prompt. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
512 If the optional argument INHERIT-INPUT-METHOD is non-nil and some |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
513 input method is turned on in the current buffer, that input method |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
514 is used for reading a character. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
515 (prompt, inherit_input_method) |
23933
d993b7332153
(Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents:
23284
diff
changeset
|
516 Lisp_Object prompt, inherit_input_method; |
341 | 517 { |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
518 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
519 message_with_string ("%s", prompt, 0); |
23933
d993b7332153
(Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents:
23284
diff
changeset
|
520 return read_filtered_event (1, 1, 1, ! NILP (inherit_input_method)); |
341 | 521 } |
522 | |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
523 DEFUN ("read-event", Fread_event, Sread_event, 0, 2, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
524 doc: /* Read an event object from the input stream. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
525 If the optional argument PROMPT is non-nil, display that as a prompt. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
526 If the optional argument INHERIT-INPUT-METHOD is non-nil and some |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
527 input method is turned on in the current buffer, that input method |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
528 is used for reading a character. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
529 (prompt, inherit_input_method) |
23933
d993b7332153
(Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents:
23284
diff
changeset
|
530 Lisp_Object prompt, inherit_input_method; |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
531 { |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
532 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
533 message_with_string ("%s", prompt, 0); |
23933
d993b7332153
(Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents:
23284
diff
changeset
|
534 return read_filtered_event (0, 0, 0, ! NILP (inherit_input_method)); |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
535 } |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
536 |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
537 DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 2, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
538 doc: /* Read a character from the command input (keyboard or macro). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
539 It is returned as a number. Non-character events are ignored. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
540 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
541 If the optional argument PROMPT is non-nil, display that as a prompt. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
542 If the optional argument INHERIT-INPUT-METHOD is non-nil and some |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
543 input method is turned on in the current buffer, that input method |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
544 is used for reading a character. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
545 (prompt, inherit_input_method) |
23933
d993b7332153
(Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents:
23284
diff
changeset
|
546 Lisp_Object prompt, inherit_input_method; |
341 | 547 { |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
548 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
549 message_with_string ("%s", prompt, 0); |
23933
d993b7332153
(Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents:
23284
diff
changeset
|
550 return read_filtered_event (1, 1, 0, ! NILP (inherit_input_method)); |
341 | 551 } |
552 | |
553 DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
554 doc: /* Don't use this yourself. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
555 () |
341 | 556 { |
557 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
|
558 XSETINT (val, getc (instream)); |
341 | 559 return val; |
560 } | |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
561 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
562 |
341 | 563 |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
564 /* Value is non-zero if the file asswociated with file descriptor FD |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
565 is a compiled Lisp file that's safe to load. Only files compiled |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
566 with Emacs are safe to load. Files compiled with XEmacs can lead |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
567 to a crash in Fbyte_code because of an incompatible change in the |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
568 byte compiler. */ |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
569 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
570 static int |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
571 safe_to_load_p (fd) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
572 int fd; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
573 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
574 char buf[512]; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
575 int nbytes, i; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
576 int safe_p = 1; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
577 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
578 /* Read the first few bytes from the file, and look for a line |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
579 specifying the byte compiler version used. */ |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
580 nbytes = emacs_read (fd, buf, sizeof buf - 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
581 if (nbytes > 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
582 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
583 buf[nbytes] = '\0'; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
584 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
585 /* Skip to the next newline, skipping over the initial `ELC' |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
586 with NUL bytes following it. */ |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
587 for (i = 0; i < nbytes && buf[i] != '\n'; ++i) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
588 ; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
589 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
590 if (i < nbytes |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
591 && fast_c_string_match_ignore_case (Vbytecomp_version_regexp, |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
592 buf + i) < 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
593 safe_p = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
594 } |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
595 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
596 lseek (fd, 0, SEEK_SET); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
597 return safe_p; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
598 } |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
599 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
600 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
601 /* Callback for record_unwind_protect. Restore the old load list OLD, |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
602 after loading a file successfully. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
603 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
604 static Lisp_Object |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
605 record_load_unwind (old) |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
606 Lisp_Object old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
607 { |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
608 return Vloads_in_progress = old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
609 } |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
610 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
611 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
612 DEFUN ("load", Fload, Sload, 1, 5, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
613 doc: /* Execute a file of Lisp code named FILE. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
614 First try FILE with `.elc' appended, then try with `.el', |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
615 then try FILE unmodified. Environment variable references in FILE |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
616 are replaced with their values by calling `substitute-in-file-name'. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
617 This function searches the directories in `load-path'. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
618 If optional second arg NOERROR is non-nil, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
619 report no error if FILE doesn't exist. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
620 Print messages at start and end of loading unless |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
621 optional third arg NOMESSAGE is non-nil. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
622 If optional fourth arg NOSUFFIX is non-nil, don't try adding |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
623 suffixes `.elc' or `.el' to the specified name FILE. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
624 If optional fifth arg MUST-SUFFIX is non-nil, insist on |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
625 the suffix `.elc' or `.el'; don't accept just FILE unless |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
626 it ends in one of those suffixes or includes a directory name. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
627 Return t if file exists. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
628 (file, noerror, nomessage, nosuffix, must_suffix) |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
629 Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; |
341 | 630 { |
631 register FILE *stream; | |
632 register int fd = -1; | |
633 register Lisp_Object lispstream; | |
634 int count = specpdl_ptr - specpdl; | |
635 Lisp_Object temp; | |
636 struct gcpro gcpro1; | |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
637 Lisp_Object found, efound; |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
638 /* 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
|
639 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
|
640 /* 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
|
641 int compiled = 0; |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
642 Lisp_Object handler; |
28370
b445e32d5a7a
(Fload): Move safe_p definition to above #ifdef DOS_NT block.
Jason Rumney <jasonr@gnu.org>
parents:
28367
diff
changeset
|
643 int safe_p = 1; |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
644 char *fmode = "r"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
645 #ifdef DOS_NT |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
646 fmode = "rt"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
647 #endif /* DOS_NT */ |
341 | 648 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
649 CHECK_STRING (file); |
341 | 650 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
651 /* If file name is magic, call the handler. */ |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
652 /* This shouldn't be necessary any more now that `openp' handles it right. |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
653 handler = Ffind_file_name_handler (file, Qload); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
654 if (!NILP (handler)) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
655 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
|
656 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
657 /* 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
|
658 the need to gcpro noerror, nomessage and nosuffix. |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
659 (Below here, we care only whether they are nil or not.) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
660 The presence of this call is the result of a historical accident: |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
661 it used to be in every file-operations and when it got removed |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
662 everywhere, it accidentally stayed here. Since then, enough people |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
663 supposedly have things like (load "$PROJECT/foo.el") in their .emacs |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
664 that it seemed risky to remove. */ |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
665 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
|
666 |
341 | 667 /* Avoid weird lossage with null string as arg, |
668 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
|
669 if (XSTRING (file)->size > 0) |
341 | 670 { |
26072
1e8b099fba75
(Fload): Calculate bytes of filename correctly.
Kenichi Handa <handa@m17n.org>
parents:
25787
diff
changeset
|
671 int size = STRING_BYTES (XSTRING (file)); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
672 Lisp_Object tmp[2]; |
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
|
673 |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
674 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
|
675 |
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
|
676 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
|
677 { |
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
|
678 /* 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
|
679 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
|
680 && !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
|
681 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
|
682 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
|
683 && !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
|
684 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
|
685 /* 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
|
686 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
|
687 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
|
688 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
|
689 } |
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
|
690 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
691 fd = openp (Vload_path, file, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
692 (!NILP (nosuffix) ? Qnil |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
693 : !NILP (must_suffix) ? Vload_suffixes |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
694 : Fappend (2, (tmp[0] = Vload_suffixes, |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
695 tmp[1] = default_suffixes, |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
696 tmp))), |
341 | 697 &found, 0); |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
698 UNGCPRO; |
341 | 699 } |
700 | |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
701 if (fd == -1) |
341 | 702 { |
485 | 703 if (NILP (noerror)) |
341 | 704 while (1) |
705 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
|
706 Fcons (file, Qnil))); |
341 | 707 else |
708 return Qnil; | |
709 } | |
710 | |
29122
47f68a566622
(Fload): Add a comment about the meaning of
Gerd Moellmann <gerd@gnu.org>
parents:
29014
diff
changeset
|
711 /* Tell startup.el whether or not we found the user's init file. */ |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
712 if (EQ (Qt, Vuser_init_file)) |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
713 Vuser_init_file = found; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
714 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
715 /* If FD is -2, that means openp found a magic file. */ |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
716 if (fd == -2) |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
717 { |
23193
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
718 if (NILP (Fequal (found, file))) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
719 /* If FOUND is a different file name from FILE, |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
720 find its handler even if we have already inhibited |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
721 the `load' operation on FILE. */ |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
722 handler = Ffind_file_name_handler (found, Qt); |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
723 else |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
724 handler = Ffind_file_name_handler (found, Qload); |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
725 if (! NILP (handler)) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
726 return call5 (handler, Qload, found, noerror, nomessage, Qt); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
727 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
728 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
729 /* Check if we're stuck in a recursive load cycle. |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
730 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
731 2000-09-21: It's not possible to just check for the file loaded |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
732 being a member of Vloads_in_progress. This fails because of the |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
733 way the byte compiler currently works; `provide's are not |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
734 evaluted, see font-lock.el/jit-lock.el as an example. This |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
735 leads to a certain amount of ``normal'' recursion. |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
736 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
737 Also, just loading a file recursively is not always an error in |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
738 the general case; the second load may do something different. */ |
41463
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
739 { |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
740 int count = 0; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
741 Lisp_Object tem; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
742 for (tem = Vloads_in_progress; CONSP (tem); tem = XCDR (tem)) |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
743 if (!NILP (Fequal (found, XCAR (tem)))) |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
744 count++; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
745 if (count > 3) |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
746 Fsignal (Qerror, Fcons (build_string ("Recursive load"), |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
747 Fcons (found, Vloads_in_progress))); |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
748 record_unwind_protect (record_load_unwind, Vloads_in_progress); |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
749 Vloads_in_progress = Fcons (found, Vloads_in_progress); |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
750 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
751 |
26072
1e8b099fba75
(Fload): Calculate bytes of filename correctly.
Kenichi Handa <handa@m17n.org>
parents:
25787
diff
changeset
|
752 if (!bcmp (&(XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 4]), |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
753 ".elc", 4)) |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
754 /* Load .elc files directly, but not when they are |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
755 remote and have no handler! */ |
341 | 756 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
757 if (fd != -2) |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
758 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
759 struct stat s1, s2; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
760 int result; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
761 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
762 if (!safe_to_load_p (fd)) |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
763 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
764 safe_p = 0; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
765 if (!load_dangerous_libraries) |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
766 error ("File `%s' was not compiled in Emacs", |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
767 XSTRING (found)->data); |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
768 else if (!NILP (nomessage)) |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
769 message_with_string ("File `%s' not compiled in Emacs", found, 1); |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
770 } |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
771 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
772 compiled = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
773 |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
774 GCPRO1 (efound); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
775 efound = ENCODE_FILE (found); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
776 |
33570 | 777 #ifdef DOS_NT |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
778 fmode = "rb"; |
33570 | 779 #endif /* DOS_NT */ |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
780 stat ((char *)XSTRING (efound)->data, &s1); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
781 XSTRING (efound)->data[STRING_BYTES (XSTRING (efound)) - 1] = 0; |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
782 result = stat ((char *)XSTRING (efound)->data, &s2); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
783 XSTRING (efound)->data[STRING_BYTES (XSTRING (efound)) - 1] = 'c'; |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
784 UNGCPRO; |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
785 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
786 if (result >= 0 && (unsigned) s1.st_mtime < (unsigned) s2.st_mtime) |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
787 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
788 /* Make the progress messages mention that source is newer. */ |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
789 newer = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
790 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
791 /* If we won't print another message, mention this anyway. */ |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
792 if (!NILP (nomessage)) |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
793 { |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
794 Lisp_Object file; |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
795 file = Fsubstring (found, make_number (0), make_number (-1)); |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
796 message_with_string ("Source file `%s' newer than byte-compiled file", |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
797 file, SMBP (file)); |
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
798 } |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
799 } |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
800 } |
341 | 801 } |
17038 | 802 else |
803 { | |
804 /* We are loading a source file (*.el). */ | |
805 if (!NILP (Vload_source_file_function)) | |
806 { | |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
807 Lisp_Object val; |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
808 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
809 if (fd >= 0) |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
810 emacs_close (fd); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
811 val = call4 (Vload_source_file_function, found, file, |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
812 NILP (noerror) ? Qnil : Qt, |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
813 NILP (nomessage) ? Qnil : Qt); |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
814 return unbind_to (count, val); |
17038 | 815 } |
816 } | |
341 | 817 |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
818 #ifdef WINDOWSNT |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
819 emacs_close (fd); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
820 GCPRO1 (efound); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
821 efound = ENCODE_FILE (found); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
822 stream = fopen ((char *) XSTRING (efound)->data, fmode); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
823 UNGCPRO; |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
824 #else /* not WINDOWSNT */ |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
825 stream = fdopen (fd, fmode); |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
826 #endif /* not WINDOWSNT */ |
341 | 827 if (stream == 0) |
828 { | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
829 emacs_close (fd); |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
830 error ("Failure to create stdio stream for %s", XSTRING (file)->data); |
341 | 831 } |
832 | |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
833 if (! NILP (Vpurify_flag)) |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
834 Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list); |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
835 |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
836 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
|
837 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
838 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
839 message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...", |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
840 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
841 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
842 message_with_string ("Loading %s (source)...", file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
843 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
844 message_with_string ("Loading %s (compiled; note, source file is newer)...", |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
845 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
846 else /* The typical case; compiled file newer than source file. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
847 message_with_string ("Loading %s...", file, 1); |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
848 } |
341 | 849 |
13036
cd0e7903d0a9
(Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents:
12780
diff
changeset
|
850 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
|
851 lispstream = Fcons (Qnil, Qnil); |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
852 XSETCARFASTINT (lispstream, (EMACS_UINT)stream >> 16); |
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
853 XSETCDRFASTINT (lispstream, (EMACS_UINT)stream & 0xffff); |
341 | 854 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
|
855 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
|
856 specbind (Qload_file_name, found); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
857 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
|
858 load_descriptor_list |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
859 = Fcons (make_number (fileno (stream)), load_descriptor_list); |
341 | 860 load_in_progress++; |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
861 readevalloop (Qget_file_char, stream, file, Feval, 0, Qnil, Qnil); |
341 | 862 unbind_to (count, Qnil); |
863 | |
864 /* 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
|
865 temp = Fassoc (file, Vafter_load_alist); |
485 | 866 if (!NILP (temp)) |
341 | 867 Fprogn (Fcdr (temp)); |
868 UNGCPRO; | |
869 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
870 if (saved_doc_string) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
871 free (saved_doc_string); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
872 saved_doc_string = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
873 saved_doc_string_size = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
874 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
875 if (prev_saved_doc_string) |
27852
98f55bbdbbad
(Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents:
27763
diff
changeset
|
876 xfree (prev_saved_doc_string); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
877 prev_saved_doc_string = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
878 prev_saved_doc_string_size = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
879 |
485 | 880 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
|
881 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
882 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
883 message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...done", |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
884 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
885 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
886 message_with_string ("Loading %s (source)...done", file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
887 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
888 message_with_string ("Loading %s (compiled; note, source file is newer)...done", |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
889 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
890 else /* The typical case; compiled file newer than source file. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
891 message_with_string ("Loading %s...done", file, 1); |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
892 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
893 |
341 | 894 return Qt; |
895 } | |
896 | |
897 static Lisp_Object | |
898 load_unwind (stream) /* used as unwind-protect function in load */ | |
899 Lisp_Object stream; | |
900 { | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
901 fclose ((FILE *) (XFASTINT (XCAR (stream)) << 16 |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
902 | XFASTINT (XCDR (stream)))); |
341 | 903 if (--load_in_progress < 0) load_in_progress = 0; |
904 return Qnil; | |
905 } | |
906 | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
907 static Lisp_Object |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
908 load_descriptor_unwind (oldlist) |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
909 Lisp_Object oldlist; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
910 { |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
911 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
|
912 return Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
913 } |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
914 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
915 /* 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
|
916 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
|
917 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
918 void |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
919 close_load_descs () |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
920 { |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
921 #ifndef WINDOWSNT |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
922 Lisp_Object tail; |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
923 for (tail = load_descriptor_list; !NILP (tail); tail = XCDR (tail)) |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
924 emacs_close (XFASTINT (XCAR (tail))); |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
925 #endif |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
926 } |
341 | 927 |
928 static int | |
929 complete_filename_p (pathname) | |
930 Lisp_Object pathname; | |
931 { | |
932 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
|
933 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
|
934 || (XSTRING (pathname)->size > 2 |
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
935 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2])) |
341 | 936 #ifdef ALTOS |
937 || *s == '@' | |
938 #endif | |
939 #ifdef VMS | |
940 || index (s, ':') | |
941 #endif /* VMS */ | |
942 ); | |
943 } | |
944 | |
945 /* Search for a file whose name is STR, looking in directories | |
946 in the Lisp list PATH, and trying suffixes from SUFFIX. | |
947 On success, returns a file descriptor. On failure, returns -1. | |
948 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
949 SUFFIXES is a list of strings containing possible suffixes. |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
950 The empty suffix is automatically added iff the list is empty. |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
951 |
341 | 952 EXEC_ONLY nonzero means don't open the files, |
953 just look for one that is executable. In this case, | |
954 returns 1 on success. | |
955 | |
956 If STOREPTR is nonzero, it points to a slot where the name of | |
957 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
|
958 nil is stored there on failure. |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
959 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
960 If the file we find is remote, return -2 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
961 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
|
962 We do not check for remote files if EXEC_ONLY is nonzero. */ |
341 | 963 |
964 int | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
965 openp (path, str, suffixes, storeptr, exec_only) |
341 | 966 Lisp_Object path, str; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
967 Lisp_Object suffixes; |
341 | 968 Lisp_Object *storeptr; |
969 int exec_only; | |
970 { | |
971 register int fd; | |
972 int fn_size = 100; | |
973 char buf[100]; | |
974 register char *fn = buf; | |
975 int absolute = 0; | |
976 int want_size; | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
977 Lisp_Object filename; |
341 | 978 struct stat st; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
979 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
980 Lisp_Object string, tail, encoded_fn; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
981 int max_suffix_len = 0; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
982 |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
983 for (tail = suffixes; CONSP (tail); tail = XCDR (tail)) |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
984 { |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
985 CHECK_STRING_CAR (tail); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
986 max_suffix_len = max (max_suffix_len, |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
987 STRING_BYTES (XSTRING (XCAR (tail)))); |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
988 } |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
989 |
31307
dd074ffca70f
(openp): GCPRO local variable `filename'.
Gerd Moellmann <gerd@gnu.org>
parents:
31250
diff
changeset
|
990 string = filename = Qnil; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
991 GCPRO6 (str, string, filename, path, suffixes, encoded_fn); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
992 |
341 | 993 if (storeptr) |
994 *storeptr = Qnil; | |
995 | |
996 if (complete_filename_p (str)) | |
997 absolute = 1; | |
998 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
999 for (; CONSP (path); path = XCDR (path)) |
341 | 1000 { |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1001 filename = Fexpand_file_name (str, XCAR (path)); |
341 | 1002 if (!complete_filename_p (filename)) |
1003 /* If there are non-absolute elts in PATH (eg ".") */ | |
1004 /* Of course, this could conceivably lose if luser sets | |
1005 default-directory to be something non-absolute... */ | |
1006 { | |
1007 filename = Fexpand_file_name (filename, current_buffer->directory); | |
1008 if (!complete_filename_p (filename)) | |
1009 /* Give up on this path element! */ | |
1010 continue; | |
1011 } | |
1012 | |
1013 /* Calculate maximum size of any filename made from | |
1014 this path element/specified file name and any possible suffix. */ | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1015 want_size = max_suffix_len + STRING_BYTES (XSTRING (filename)) + 1; |
341 | 1016 if (fn_size < want_size) |
1017 fn = (char *) alloca (fn_size = 100 + want_size); | |
1018 | |
1019 /* Loop over suffixes. */ | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1020 for (tail = NILP (suffixes) ? default_suffixes : suffixes; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1021 CONSP (tail); tail = XCDR (tail)) |
341 | 1022 { |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1023 int lsuffix = STRING_BYTES (XSTRING (XCAR (tail))); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1024 Lisp_Object handler; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1025 int exists; |
341 | 1026 |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1027 /* 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
|
1028 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
|
1029 if (XSTRING (filename)->size > 2 |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1030 && XSTRING (filename)->data[0] == '/' |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1031 && XSTRING (filename)->data[1] == ':') |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1032 { |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1033 strncpy (fn, XSTRING (filename)->data + 2, |
26072
1e8b099fba75
(Fload): Calculate bytes of filename correctly.
Kenichi Handa <handa@m17n.org>
parents:
25787
diff
changeset
|
1034 STRING_BYTES (XSTRING (filename)) - 2); |
1e8b099fba75
(Fload): Calculate bytes of filename correctly.
Kenichi Handa <handa@m17n.org>
parents:
25787
diff
changeset
|
1035 fn[STRING_BYTES (XSTRING (filename)) - 2] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1036 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1037 else |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1038 { |
26072
1e8b099fba75
(Fload): Calculate bytes of filename correctly.
Kenichi Handa <handa@m17n.org>
parents:
25787
diff
changeset
|
1039 strncpy (fn, XSTRING (filename)->data, |
1e8b099fba75
(Fload): Calculate bytes of filename correctly.
Kenichi Handa <handa@m17n.org>
parents:
25787
diff
changeset
|
1040 STRING_BYTES (XSTRING (filename))); |
1e8b099fba75
(Fload): Calculate bytes of filename correctly.
Kenichi Handa <handa@m17n.org>
parents:
25787
diff
changeset
|
1041 fn[STRING_BYTES (XSTRING (filename))] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1042 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1043 |
341 | 1044 if (lsuffix != 0) /* Bug happens on CCI if lsuffix is 0. */ |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1045 strncat (fn, XSTRING (XCAR (tail))->data, lsuffix); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1046 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1047 /* Check that the file exists and is not a directory. */ |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1048 /* We used to only check for handlers on non-absolute file names: |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1049 if (absolute) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1050 handler = Qnil; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1051 else |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1052 handler = Ffind_file_name_handler (filename, Qfile_exists_p); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1053 It's not clear why that was the case and it breaks things like |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1054 (load "/bar.el") where the file is actually "/bar.el.gz". */ |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1055 handler = Ffind_file_name_handler (filename, Qfile_exists_p); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1056 string = build_string (fn); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1057 if (!NILP (handler) && !exec_only) |
341 | 1058 { |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1059 exists = !NILP (Ffile_readable_p (string)); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1060 if (exists && !NILP (Ffile_directory_p (string))) |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1061 exists = 0; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1062 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1063 if (exists) |
341 | 1064 { |
1065 /* We succeeded; return this descriptor and filename. */ | |
1066 if (storeptr) | |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1067 *storeptr = string; |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1068 UNGCPRO; |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1069 return -2; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1070 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1071 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1072 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1073 { |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1074 char *pfn; |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1075 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1076 encoded_fn = ENCODE_FILE (string); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1077 pfn = XSTRING (encoded_fn)->data; |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1078 exists = (stat (pfn, &st) >= 0 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1079 && (st.st_mode & S_IFMT) != S_IFDIR); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1080 if (exists) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1081 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1082 /* 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
|
1083 if (exec_only) |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1084 fd = (access (pfn, X_OK) == 0) ? 1 : -1; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1085 else |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1086 fd = emacs_open (pfn, O_RDONLY, 0); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1087 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1088 if (fd >= 0) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1089 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1090 /* 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
|
1091 if (storeptr) |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1092 *storeptr = string; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1093 UNGCPRO; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1094 return fd; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1095 } |
341 | 1096 } |
1097 } | |
1098 } | |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1099 if (absolute) |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1100 break; |
341 | 1101 } |
1102 | |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1103 UNGCPRO; |
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1104 return -1; |
341 | 1105 } |
1106 | |
1107 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1108 /* 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
|
1109 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
|
1110 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
|
1111 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1112 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
|
1113 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
|
1114 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
|
1115 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
|
1116 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1117 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
|
1118 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
|
1119 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
|
1120 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1121 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
|
1122 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1123 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
|
1124 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
|
1125 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
|
1126 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
|
1127 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1128 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
|
1129 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1130 /* 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
|
1131 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
|
1132 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1133 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
|
1134 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1135 /* 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
|
1136 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
|
1137 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1138 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
|
1139 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
|
1140 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1141 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
|
1142 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1143 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1144 /* 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
|
1145 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1146 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1147 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
|
1148 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1149 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
|
1150 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1151 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
|
1152 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1153 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
|
1154 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
|
1155 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
|
1156 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1157 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
|
1158 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1159 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1160 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1161 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1162 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1163 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
|
1164 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
|
1165 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1166 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1167 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
1168 /* 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
|
1169 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
|
1170 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
|
1171 if (loading || !foundit) |
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
1172 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
|
1173 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
|
1174 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1175 |
341 | 1176 Lisp_Object |
30917
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1177 unreadpure (junk) /* Used as unwind-protect function in readevalloop */ |
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1178 Lisp_Object junk; |
341 | 1179 { |
1180 read_pure = 0; | |
1181 return Qnil; | |
1182 } | |
1183 | |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1184 static Lisp_Object |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1185 readevalloop_1 (old) |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1186 Lisp_Object old; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1187 { |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1188 load_convert_to_unibyte = ! NILP (old); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1189 return Qnil; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1190 } |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1191 |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1192 /* Signal an `end-of-file' error, if possible with file name |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1193 information. */ |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1194 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1195 static void |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1196 end_of_file_error () |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1197 { |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1198 Lisp_Object data; |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1199 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1200 if (STRINGP (Vload_file_name)) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1201 data = Fcons (Vload_file_name, Qnil); |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1202 else |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1203 data = Qnil; |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1204 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1205 Fsignal (Qend_of_file, data); |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1206 } |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1207 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1208 /* UNIBYTE specifies how to set load_convert_to_unibyte |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1209 for this invocation. |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1210 READFUN, if non-nil, is used instead of `read'. */ |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1211 |
341 | 1212 static void |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1213 readevalloop (readcharfun, stream, sourcename, evalfun, printflag, unibyte, readfun) |
341 | 1214 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
|
1215 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
|
1216 Lisp_Object sourcename; |
341 | 1217 Lisp_Object (*evalfun) (); |
1218 int printflag; | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1219 Lisp_Object unibyte, readfun; |
341 | 1220 { |
1221 register int c; | |
1222 register Lisp_Object val; | |
1223 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
|
1224 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
|
1225 struct buffer *b = 0; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1226 int continue_reading_p; |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1227 |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1228 if (BUFFERP (readcharfun)) |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1229 b = XBUFFER (readcharfun); |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1230 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
|
1231 b = XMARKER (readcharfun)->buffer; |
341 | 1232 |
1233 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
|
1234 specbind (Qcurrent_load_list, Qnil); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1235 record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1236 load_convert_to_unibyte = !NILP (unibyte); |
341 | 1237 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
1238 readchar_backlog = -1; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1239 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
1240 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
|
1241 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1242 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
|
1243 |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1244 continue_reading_p = 1; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1245 while (continue_reading_p) |
341 | 1246 { |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1247 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
|
1248 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
|
1249 |
341 | 1250 instream = stream; |
1251 c = READCHAR; | |
1252 if (c == ';') | |
1253 { | |
1254 while ((c = READCHAR) != '\n' && c != -1); | |
1255 continue; | |
1256 } | |
1257 if (c < 0) break; | |
10163
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1258 |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1259 /* Ignore whitespace here, so we can detect eof. */ |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1260 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
|
1261 continue; |
341 | 1262 |
485 | 1263 if (!NILP (Vpurify_flag) && c == '(') |
341 | 1264 { |
8182
94f524e0d5cd
(readevalloop): Correctly unbind the unwind protect.
Richard M. Stallman <rms@gnu.org>
parents:
8083
diff
changeset
|
1265 int count1 = specpdl_ptr - specpdl; |
341 | 1266 record_unwind_protect (unreadpure, Qnil); |
1267 val = read_list (-1, readcharfun); | |
8182
94f524e0d5cd
(readevalloop): Correctly unbind the unwind protect.
Richard M. Stallman <rms@gnu.org>
parents:
8083
diff
changeset
|
1268 unbind_to (count1, Qnil); |
341 | 1269 } |
1270 else | |
1271 { | |
1272 UNREAD (c); | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1273 read_objects = Qnil; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1274 if (!NILP (readfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1275 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1276 val = call1 (readfun, readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1277 |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1278 /* If READCHARFUN has set point to ZV, we should |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1279 stop reading, even if the form read sets point |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1280 to a different value when evaluated. */ |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1281 if (BUFFERP (readcharfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1282 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1283 struct buffer *b = XBUFFER (readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1284 if (BUF_PT (b) == BUF_ZV (b)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1285 continue_reading_p = 0; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1286 } |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1287 } |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1288 else if (! NILP (Vload_read_function)) |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1289 val = call1 (Vload_read_function, readcharfun); |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1290 else |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
1291 val = read0 (readcharfun); |
341 | 1292 } |
1293 | |
1294 val = (*evalfun) (val); | |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1295 |
341 | 1296 if (printflag) |
1297 { | |
1298 Vvalues = Fcons (val, Vvalues); | |
1299 if (EQ (Vstandard_output, Qt)) | |
1300 Fprin1 (val, Qnil); | |
1301 else | |
1302 Fprint (val, Qnil); | |
1303 } | |
1304 } | |
1305 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1306 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
|
1307 UNGCPRO; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1308 |
341 | 1309 unbind_to (count, Qnil); |
1310 } | |
1311 | |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1312 DEFUN ("eval-buffer", Feval_buffer, Seval_buffer, 0, 5, "", |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1313 doc: /* Execute the current buffer as Lisp code. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1314 Programs can pass two arguments, BUFFER and PRINTFLAG. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1315 BUFFER is the buffer to evaluate (nil means use current buffer). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1316 PRINTFLAG controls printing of output: |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1317 nil means discard it; anything else is stream for print. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1318 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1319 If the optional third argument FILENAME is non-nil, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1320 it specifies the file name to use for `load-history'. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1321 The optional fourth argument UNIBYTE specifies `load-convert-to-unibyte' |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1322 for this invocation. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1323 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1324 The optional fifth argument DO-ALLOW-PRINT, if not-nil, specifies that |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1325 `print' and related functions should work normally even if PRINTFLAG is nil. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1326 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1327 This function preserves the position of point. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1328 (buffer, printflag, filename, unibyte, do_allow_print) |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1329 Lisp_Object buffer, printflag, filename, unibyte, do_allow_print; |
672 | 1330 { |
1331 int count = specpdl_ptr - specpdl; | |
1332 Lisp_Object tem, buf; | |
1333 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1334 if (NILP (buffer)) |
672 | 1335 buf = Fcurrent_buffer (); |
1336 else | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1337 buf = Fget_buffer (buffer); |
673 | 1338 if (NILP (buf)) |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1339 error ("No such buffer"); |
672 | 1340 |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1341 if (NILP (printflag) && NILP (do_allow_print)) |
672 | 1342 tem = Qsymbolp; |
1343 else | |
1344 tem = printflag; | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1345 |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1346 if (NILP (filename)) |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1347 filename = XBUFFER (buf)->filename; |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1348 |
672 | 1349 specbind (Qstandard_output, tem); |
1350 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1351 BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf))); | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1352 readevalloop (buf, 0, filename, Feval, !NILP (printflag), unibyte, Qnil); |
1924
21bd3a2189d3
* keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents:
1887
diff
changeset
|
1353 unbind_to (count, Qnil); |
672 | 1354 |
1355 return Qnil; | |
1356 } | |
1357 | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1358 DEFUN ("eval-region", Feval_region, Seval_region, 2, 4, "r", |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1359 doc: /* Execute the region as Lisp code. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1360 When called from programs, expects two arguments, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1361 giving starting and ending indices in the current buffer |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1362 of the text to be executed. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1363 Programs can pass third argument PRINTFLAG which controls output: |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1364 nil means discard it; anything else is stream for printing it. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1365 Also the fourth argument READ-FUNCTION, if non-nil, is used |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1366 instead of `read' to read each expression. It gets one argument |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1367 which is the input stream for reading characters. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1368 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1369 This function does not move point. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1370 (start, end, printflag, read_function) |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1371 Lisp_Object start, end, printflag, read_function; |
341 | 1372 { |
1373 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
|
1374 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
|
1375 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1376 cbuf = Fcurrent_buffer (); |
341 | 1377 |
485 | 1378 if (NILP (printflag)) |
341 | 1379 tem = Qsymbolp; |
1380 else | |
1381 tem = printflag; | |
1382 specbind (Qstandard_output, tem); | |
1383 | |
485 | 1384 if (NILP (printflag)) |
341 | 1385 record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
1386 record_unwind_protect (save_restriction_restore, save_restriction_save ()); | |
1387 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1388 /* 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
|
1389 Fgoto_char (start); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1390 Fnarrow_to_region (make_number (BEGV), end); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1391 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1392 !NILP (printflag), Qnil, read_function); |
341 | 1393 |
1394 return unbind_to (count, Qnil); | |
1395 } | |
1396 | |
1397 | |
1398 DEFUN ("read", Fread, Sread, 0, 1, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1399 doc: /* Read one Lisp expression as text from STREAM, return as Lisp object. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1400 If STREAM is nil, use the value of `standard-input' (which see). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1401 STREAM or the value of `standard-input' may be: |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1402 a buffer (read from point and advance it) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1403 a marker (read from where it points and advance it) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1404 a function (call it with no arguments for each character, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1405 call it with a char as argument to push a char back) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1406 a string (takes text from string, starting at the beginning) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1407 t (read text line using minibuffer and use it, or read from |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1408 standard input in batch mode). */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1409 (stream) |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1410 Lisp_Object stream; |
341 | 1411 { |
1412 extern Lisp_Object Fread_minibuffer (); | |
1413 | |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1414 if (NILP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1415 stream = Vstandard_input; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1416 if (EQ (stream, Qt)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1417 stream = Qread_char; |
341 | 1418 |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
1419 readchar_backlog = -1; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1420 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1421 read_objects = Qnil; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1422 |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1423 if (EQ (stream, Qread_char)) |
341 | 1424 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); |
1425 | |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1426 if (STRINGP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1427 return Fcar (Fread_from_string (stream, Qnil, Qnil)); |
341 | 1428 |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1429 return read0 (stream); |
341 | 1430 } |
1431 | |
1432 DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1433 doc: /* Read one Lisp expression which is represented as text by STRING. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1434 Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1435 START and END optionally delimit a substring of STRING from which to read; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1436 they default to 0 and (length STRING) respectively. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1437 (string, start, end) |
341 | 1438 Lisp_Object string, start, end; |
1439 { | |
1440 int startval, endval; | |
1441 Lisp_Object tem; | |
1442 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1443 CHECK_STRING (string); |
341 | 1444 |
485 | 1445 if (NILP (end)) |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
1446 endval = XSTRING (string)->size; |
341 | 1447 else |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1448 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1449 CHECK_NUMBER (end); |
21761
7c159e118cd4
(Fread_from_string): Initialize startval and endval.
Richard M. Stallman <rms@gnu.org>
parents:
21759
diff
changeset
|
1450 endval = XINT (end); |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
1451 if (endval < 0 || endval > XSTRING (string)->size) |
341 | 1452 args_out_of_range (string, end); |
1453 } | |
1454 | |
485 | 1455 if (NILP (start)) |
341 | 1456 startval = 0; |
1457 else | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1458 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1459 CHECK_NUMBER (start); |
21761
7c159e118cd4
(Fread_from_string): Initialize startval and endval.
Richard M. Stallman <rms@gnu.org>
parents:
21759
diff
changeset
|
1460 startval = XINT (start); |
341 | 1461 if (startval < 0 || startval > endval) |
1462 args_out_of_range (string, start); | |
1463 } | |
1464 | |
1465 read_from_string_index = startval; | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
1466 read_from_string_index_byte = string_char_to_byte (string, startval); |
341 | 1467 read_from_string_limit = endval; |
1468 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1469 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1470 read_objects = Qnil; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1471 |
341 | 1472 tem = read0 (string); |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
1473 return Fcons (tem, make_number (read_from_string_index)); |
341 | 1474 } |
1475 | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1476 /* 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
|
1477 are not allowed. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1478 |
341 | 1479 static Lisp_Object |
1480 read0 (readcharfun) | |
1481 Lisp_Object readcharfun; | |
1482 { | |
1483 register Lisp_Object val; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1484 int c; |
341 | 1485 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1486 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
|
1487 if (c) |
21211
293254dae80a
(read0): Swap args to Fmake_string.
Richard M. Stallman <rms@gnu.org>
parents:
20815
diff
changeset
|
1488 Fsignal (Qinvalid_read_syntax, Fcons (Fmake_string (make_number (1), |
293254dae80a
(read0): Swap args to Fmake_string.
Richard M. Stallman <rms@gnu.org>
parents:
20815
diff
changeset
|
1489 make_number (c)), |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1490 Qnil)); |
341 | 1491 |
1492 return val; | |
1493 } | |
1494 | |
1495 static int read_buffer_size; | |
1496 static char *read_buffer; | |
1497 | |
17038 | 1498 /* Read multibyte form and return it as a character. C is a first |
1499 byte of multibyte form, and rest of them are read from | |
1500 READCHARFUN. */ | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1501 |
17038 | 1502 static int |
1503 read_multibyte (c, readcharfun) | |
1504 register int c; | |
1505 Lisp_Object readcharfun; | |
1506 { | |
1507 /* We need the actual character code of this multibyte | |
1508 characters. */ | |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
1509 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
17038 | 1510 int len = 0; |
36757
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1511 int bytes; |
17038 | 1512 |
1513 str[len++] = c; | |
1514 while ((c = READCHAR) >= 0xA0 | |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
1515 && len < MAX_MULTIBYTE_LENGTH) |
17038 | 1516 str[len++] = c; |
1517 UNREAD (c); | |
36757
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1518 if (UNIBYTE_STR_AS_MULTIBYTE_P (str, len, bytes)) |
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1519 return STRING_CHAR (str, len); |
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1520 /* The byte sequence is not valid as multibyte. Unread all bytes |
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1521 but the first one, and return the first byte. */ |
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1522 while (--len > 0) |
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1523 UNREAD (str[len]); |
23382dbfb9d0
(read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents:
36256
diff
changeset
|
1524 return str[0]; |
17038 | 1525 } |
1526 | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1527 /* Read a \-escape sequence, assuming we already read the `\'. |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1528 If the escape sequence forces unibyte, store 1 into *BYTEREP. |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1529 If the escape sequence forces multibyte, store 2 into *BYTEREP. |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1530 Otherwise store 0 into *BYTEREP. */ |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1531 |
341 | 1532 static int |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1533 read_escape (readcharfun, stringp, byterep) |
341 | 1534 Lisp_Object readcharfun; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1535 int stringp; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1536 int *byterep; |
341 | 1537 { |
1538 register int c = READCHAR; | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1539 |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1540 *byterep = 0; |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1541 |
341 | 1542 switch (c) |
1543 { | |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1544 case -1: |
40931
50b111aed6d5
(read_escape): Use end_of_file_error for reporting eof.
Richard M. Stallman <rms@gnu.org>
parents:
40796
diff
changeset
|
1545 end_of_file_error (); |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1546 |
341 | 1547 case 'a': |
485 | 1548 return '\007'; |
341 | 1549 case 'b': |
1550 return '\b'; | |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1551 case 'd': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1552 return 0177; |
341 | 1553 case 'e': |
1554 return 033; | |
1555 case 'f': | |
1556 return '\f'; | |
1557 case 'n': | |
1558 return '\n'; | |
1559 case 'r': | |
1560 return '\r'; | |
1561 case 't': | |
1562 return '\t'; | |
1563 case 'v': | |
1564 return '\v'; | |
1565 case '\n': | |
1566 return -1; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1567 case ' ': |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1568 if (stringp) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1569 return -1; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
1570 return ' '; |
341 | 1571 |
1572 case 'M': | |
1573 c = READCHAR; | |
1574 if (c != '-') | |
1575 error ("Invalid escape character syntax"); | |
1576 c = READCHAR; | |
1577 if (c == '\\') | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1578 c = read_escape (readcharfun, 0, byterep); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1579 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
|
1580 |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1581 case 'S': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1582 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1583 if (c != '-') |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1584 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
|
1585 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1586 if (c == '\\') |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1587 c = read_escape (readcharfun, 0, byterep); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1588 return c | shift_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1589 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1590 case 'H': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1591 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1592 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1593 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1594 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1595 if (c == '\\') |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1596 c = read_escape (readcharfun, 0, byterep); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1597 return c | hyper_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1598 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1599 case 'A': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1600 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1601 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1602 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1603 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1604 if (c == '\\') |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1605 c = read_escape (readcharfun, 0, byterep); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1606 return c | alt_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1607 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1608 case 's': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1609 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1610 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1611 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1612 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1613 if (c == '\\') |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1614 c = read_escape (readcharfun, 0, byterep); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1615 return c | super_modifier; |
341 | 1616 |
1617 case 'C': | |
1618 c = READCHAR; | |
1619 if (c != '-') | |
1620 error ("Invalid escape character syntax"); | |
1621 case '^': | |
1622 c = READCHAR; | |
1623 if (c == '\\') | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1624 c = read_escape (readcharfun, 0, byterep); |
25251
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
1625 if ((c & ~CHAR_MODIFIER_MASK) == '?') |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
1626 return 0177 | (c & CHAR_MODIFIER_MASK); |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
1627 else if (! SINGLE_BYTE_CHAR_P ((c & ~CHAR_MODIFIER_MASK))) |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
1628 return c | ctrl_modifier; |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1629 /* 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
|
1630 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
|
1631 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
|
1632 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
|
1633 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
|
1634 return (c & (037 | ~0177)); |
341 | 1635 else |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
1636 return c | ctrl_modifier; |
341 | 1637 |
1638 case '0': | |
1639 case '1': | |
1640 case '2': | |
1641 case '3': | |
1642 case '4': | |
1643 case '5': | |
1644 case '6': | |
1645 case '7': | |
1646 /* An octal escape, as in ANSI C. */ | |
1647 { | |
1648 register int i = c - '0'; | |
1649 register int count = 0; | |
1650 while (++count < 3) | |
1651 { | |
1652 if ((c = READCHAR) >= '0' && c <= '7') | |
1653 { | |
1654 i *= 8; | |
1655 i += c - '0'; | |
1656 } | |
1657 else | |
1658 { | |
1659 UNREAD (c); | |
1660 break; | |
1661 } | |
1662 } | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1663 |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1664 *byterep = 1; |
341 | 1665 return i; |
1666 } | |
1667 | |
1668 case 'x': | |
1669 /* A hex escape, as in ANSI C. */ | |
1670 { | |
1671 int i = 0; | |
1672 while (1) | |
1673 { | |
1674 c = READCHAR; | |
1675 if (c >= '0' && c <= '9') | |
1676 { | |
1677 i *= 16; | |
1678 i += c - '0'; | |
1679 } | |
1680 else if ((c >= 'a' && c <= 'f') | |
1681 || (c >= 'A' && c <= 'F')) | |
1682 { | |
1683 i *= 16; | |
1684 if (c >= 'a' && c <= 'f') | |
1685 i += c - 'a' + 10; | |
1686 else | |
1687 i += c - 'A' + 10; | |
1688 } | |
1689 else | |
1690 { | |
1691 UNREAD (c); | |
1692 break; | |
1693 } | |
1694 } | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1695 |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1696 *byterep = 2; |
341 | 1697 return i; |
1698 } | |
1699 | |
1700 default: | |
17038 | 1701 if (BASE_LEADING_CODE_P (c)) |
1702 c = read_multibyte (c, readcharfun); | |
341 | 1703 return c; |
1704 } | |
1705 } | |
1706 | |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1707 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1708 /* Read an integer in radix RADIX using READCHARFUN to read |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1709 characters. RADIX must be in the interval [2..36]; if it isn't, a |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1710 read error is signaled . Value is the integer read. Signals an |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1711 error if encountering invalid read syntax or if RADIX is out of |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1712 range. */ |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1713 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1714 static Lisp_Object |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1715 read_integer (readcharfun, radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1716 Lisp_Object readcharfun; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1717 int radix; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1718 { |
35543
c809110e1433
(read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents:
34604
diff
changeset
|
1719 int ndigits = 0, invalid_p, c, sign = 0; |
c809110e1433
(read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents:
34604
diff
changeset
|
1720 EMACS_INT number = 0; |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1721 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1722 if (radix < 2 || radix > 36) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1723 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1724 else |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1725 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1726 number = ndigits = invalid_p = 0; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1727 sign = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1728 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1729 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1730 if (c == '-') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1731 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1732 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1733 sign = -1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1734 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1735 else if (c == '+') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1736 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1737 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1738 while (c >= 0) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1739 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1740 int digit; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1741 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1742 if (c >= '0' && c <= '9') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1743 digit = c - '0'; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1744 else if (c >= 'a' && c <= 'z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1745 digit = c - 'a' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1746 else if (c >= 'A' && c <= 'Z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1747 digit = c - 'A' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1748 else |
28190
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
1749 { |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
1750 UNREAD (c); |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
1751 break; |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
1752 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1753 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1754 if (digit < 0 || digit >= radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1755 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1756 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1757 number = radix * number + digit; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1758 ++ndigits; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1759 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1760 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1761 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1762 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1763 if (ndigits == 0 || invalid_p) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1764 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1765 char buf[50]; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1766 sprintf (buf, "integer, radix %d", radix); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1767 Fsignal (Qinvalid_read_syntax, Fcons (build_string (buf), Qnil)); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1768 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1769 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1770 return make_number (sign * number); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1771 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1772 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
1773 |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1774 /* Convert unibyte text in read_buffer to multibyte. |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1775 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1776 Initially, *P is a pointer after the end of the unibyte text, and |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1777 the pointer *END points after the end of read_buffer. |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1778 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1779 If read_buffer doesn't have enough room to hold the result |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1780 of the conversion, reallocate it and adjust *P and *END. |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1781 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1782 At the end, make *P point after the result of the conversion, and |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1783 return in *NCHARS the number of characters in the converted |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1784 text. */ |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1785 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1786 static void |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1787 to_multibyte (p, end, nchars) |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1788 char **p, **end; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1789 int *nchars; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1790 { |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1791 int nbytes; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1792 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1793 parse_str_as_multibyte (read_buffer, *p - read_buffer, &nbytes, nchars); |
40506
81ab7b9aefcc
(to_multibyte): Ensure read_buffer is at least twice
Gerd Moellmann <gerd@gnu.org>
parents:
40503
diff
changeset
|
1794 if (read_buffer_size < 2 * nbytes) |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1795 { |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1796 int offset = *p - read_buffer; |
40558
0f4185c9842a
(to_multibyte): Fix computation of new read_buffer_size.
Gerd Moellmann <gerd@gnu.org>
parents:
40508
diff
changeset
|
1797 read_buffer_size = 2 * max (read_buffer_size, nbytes); |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1798 read_buffer = (char *) xrealloc (read_buffer, read_buffer_size); |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1799 *p = read_buffer + offset; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1800 *end = read_buffer + read_buffer_size; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1801 } |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1802 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1803 if (nbytes != *nchars) |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1804 nbytes = str_as_multibyte (read_buffer, read_buffer_size, |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1805 *p - read_buffer, nchars); |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1806 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1807 *p = read_buffer + nbytes; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1808 } |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1809 |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
1810 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1811 /* 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
|
1812 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
|
1813 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
|
1814 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1815 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
|
1816 |
341 | 1817 static Lisp_Object |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1818 read1 (readcharfun, pch, first_in_list) |
341 | 1819 register Lisp_Object readcharfun; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1820 int *pch; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1821 int first_in_list; |
341 | 1822 { |
1823 register int c; | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1824 int uninterned_symbol = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1825 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1826 *pch = 0; |
341 | 1827 |
1828 retry: | |
1829 | |
1830 c = READCHAR; | |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1831 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1832 end_of_file_error (); |
341 | 1833 |
1834 switch (c) | |
1835 { | |
1836 case '(': | |
1837 return read_list (0, readcharfun); | |
1838 | |
1839 case '[': | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1840 return read_vector (readcharfun, 0); |
341 | 1841 |
1842 case ')': | |
1843 case ']': | |
1844 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1845 *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
|
1846 return Qnil; |
341 | 1847 } |
1848 | |
1849 case '#': | |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1850 c = READCHAR; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1851 if (c == '^') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1852 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1853 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1854 if (c == '[') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1855 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1856 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1857 tmp = read_vector (readcharfun, 0); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1858 if (XVECTOR (tmp)->size < CHAR_TABLE_STANDARD_SLOTS |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1859 || XVECTOR (tmp)->size > CHAR_TABLE_STANDARD_SLOTS + 10) |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1860 error ("Invalid size char-table"); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1861 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
|
1862 XCHAR_TABLE (tmp)->top = Qt; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1863 return tmp; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1864 } |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1865 else if (c == '^') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1866 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1867 c = READCHAR; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1868 if (c == '[') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1869 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1870 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1871 tmp = read_vector (readcharfun, 0); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1872 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
|
1873 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
|
1874 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
|
1875 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
|
1876 return tmp; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1877 } |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1878 Fsignal (Qinvalid_read_syntax, |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
1879 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
|
1880 } |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1881 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
|
1882 } |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1883 if (c == '&') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1884 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1885 Lisp_Object length; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1886 length = read1 (readcharfun, pch, first_in_list); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1887 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1888 if (c == '"') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1889 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1890 Lisp_Object tmp, val; |
16925
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1891 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
|
1892 / BITS_PER_CHAR); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1893 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1894 UNREAD (c); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1895 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
|
1896 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
|
1897 /* 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
|
1898 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
|
1899 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
|
1900 && ! (XFASTINT (length) |
2b35e4ccbb32
(read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents:
16856
diff
changeset
|
1901 == (XSTRING (tmp)->size - 1) * BITS_PER_CHAR)) |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1902 Fsignal (Qinvalid_read_syntax, |
16856 | 1903 Fcons (make_string ("#&...", 5), Qnil)); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1904 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1905 val = Fmake_bool_vector (length, Qnil); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1906 bcopy (XSTRING (tmp)->data, XBOOL_VECTOR (val)->data, |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1907 size_in_chars); |
21935
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
1908 /* Clear the extraneous bits in the last byte. */ |
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
1909 if (XINT (length) != size_in_chars * BITS_PER_CHAR) |
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
1910 XBOOL_VECTOR (val)->data[size_in_chars - 1] |
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
1911 &= (1 << (XINT (length) % BITS_PER_CHAR)) - 1; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1912 return val; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1913 } |
16856 | 1914 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5), |
16855
d10bb3a79eff
(read1): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents:
16487
diff
changeset
|
1915 Qnil)); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
1916 } |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1917 if (c == '[') |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1918 { |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1919 /* 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
|
1920 build them using function calls. */ |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1921 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1922 tmp = read_vector (readcharfun, 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1923 return Fmake_byte_code (XVECTOR (tmp)->size, |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1924 XVECTOR (tmp)->contents); |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
1925 } |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1926 if (c == '(') |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1927 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1928 Lisp_Object tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1929 struct gcpro gcpro1; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1930 int ch; |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1931 |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1932 /* 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
|
1933 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
|
1934 if (ch != 0 || !STRINGP (tmp)) |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1935 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
|
1936 GCPRO1 (tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1937 /* Read the intervals and their properties. */ |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1938 while (1) |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1939 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1940 Lisp_Object beg, end, plist; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1941 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1942 beg = read1 (readcharfun, &ch, 0); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1943 end = plist = Qnil; |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1944 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
|
1945 break; |
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1946 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1947 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
|
1948 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1949 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
|
1950 if (ch) |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1951 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
|
1952 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
|
1953 Qnil)); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1954 Fset_text_properties (beg, end, plist, tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1955 } |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1956 UNGCPRO; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1957 return tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
1958 } |
26404
c3c9cc1c2379
Remove USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents:
26088
diff
changeset
|
1959 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1960 /* #@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
|
1961 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
|
1962 and function definitions. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1963 if (c == '@') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1964 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1965 int i, nskip = 0; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1966 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1967 /* Read a decimal integer. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1968 while ((c = READCHAR) >= 0 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1969 && c >= '0' && c <= '9') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1970 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1971 nskip *= 10; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1972 nskip += c - '0'; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1973 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1974 if (c >= 0) |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1975 UNREAD (c); |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
1976 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1977 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
|
1978 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1979 /* 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
|
1980 record the last string that we skipped, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1981 and record where in the file it comes from. */ |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1982 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1983 /* But first exchange saved_doc_string |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1984 with prev_saved_doc_string, so we save two strings. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1985 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1986 char *temp = saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1987 int temp_size = saved_doc_string_size; |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1988 file_offset temp_pos = saved_doc_string_position; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1989 int temp_len = saved_doc_string_length; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1990 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1991 saved_doc_string = prev_saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1992 saved_doc_string_size = prev_saved_doc_string_size; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1993 saved_doc_string_position = prev_saved_doc_string_position; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1994 saved_doc_string_length = prev_saved_doc_string_length; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1995 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1996 prev_saved_doc_string = temp; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1997 prev_saved_doc_string_size = temp_size; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1998 prev_saved_doc_string_position = temp_pos; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1999 prev_saved_doc_string_length = temp_len; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2000 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2001 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2002 if (saved_doc_string_size == 0) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2003 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2004 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
|
2005 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
|
2006 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2007 if (nskip > saved_doc_string_size) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2008 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2009 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
|
2010 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
|
2011 saved_doc_string_size); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2012 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2013 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
2014 saved_doc_string_position = file_tell (instream); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2015 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2016 /* Copy that many characters into saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2017 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2018 saved_doc_string[i] = c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2019 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2020 saved_doc_string_length = i; |
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 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2023 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2024 /* Skip that many characters. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2025 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2026 c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2027 } |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
2028 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2029 goto retry; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2030 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2031 if (c == '$') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2032 return Vload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2033 if (c == '\'') |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2034 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
|
2035 /* #: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
|
2036 if (c == ':') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2037 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2038 uninterned_symbol = 1; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2039 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2040 goto default_label; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2041 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2042 /* 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
|
2043 if (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2044 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2045 int n = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2046 Lisp_Object tem; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2047 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2048 /* Read a non-negative integer. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2049 while (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2050 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2051 n *= 10; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2052 n += c - '0'; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2053 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2054 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2055 /* #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
|
2056 if (c == '=') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2057 { |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2058 /* Make a placeholder for #n# to use temporarily */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2059 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2060 Lisp_Object cell; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2061 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2062 placeholder = Fcons(Qnil, Qnil); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2063 cell = Fcons (make_number (n), placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2064 read_objects = Fcons (cell, read_objects); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2065 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2066 /* Read the object itself. */ |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2067 tem = read0 (readcharfun); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2068 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2069 /* Now put it everywhere the placeholder was... */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2070 substitute_object_in_subtree (tem, placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2071 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2072 /* ...and #n# will use the real value from now on. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2073 Fsetcdr (cell, tem); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2074 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2075 return tem; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2076 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2077 /* #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
|
2078 if (c == '#') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2079 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2080 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
|
2081 if (CONSP (tem)) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2082 return XCDR (tem); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2083 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2084 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2085 else if (c == 'r' || c == 'R') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2086 return read_integer (readcharfun, n); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2087 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2088 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2089 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2090 else if (c == 'x' || c == 'X') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2091 return read_integer (readcharfun, 16); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2092 else if (c == 'o' || c == 'O') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2093 return read_integer (readcharfun, 8); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2094 else if (c == 'b' || c == 'B') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2095 return read_integer (readcharfun, 2); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2096 |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2097 UNREAD (c); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2098 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil)); |
341 | 2099 |
2100 case ';': | |
2101 while ((c = READCHAR) >= 0 && c != '\n'); | |
2102 goto retry; | |
2103 | |
2104 case '\'': | |
2105 { | |
2106 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil)); | |
2107 } | |
2108 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2109 case '`': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2110 if (first_in_list) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2111 goto default_label; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2112 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2113 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2114 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2115 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2116 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2117 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2118 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2119 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2120 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
|
2121 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2122 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2123 case ',': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2124 if (new_backquote_flag) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2125 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2126 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
|
2127 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2128 int ch = READCHAR; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2129 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2130 if (ch == '@') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2131 comma_type = Qcomma_at; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2132 else if (ch == '.') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2133 comma_type = Qcomma_dot; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2134 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2135 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2136 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
|
2137 comma_type = Qcomma; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2138 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2139 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2140 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2141 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2142 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2143 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
|
2144 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2145 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2146 goto default_label; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2147 |
341 | 2148 case '?': |
2149 { | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2150 int discard; |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2151 |
341 | 2152 c = READCHAR; |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2153 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2154 end_of_file_error (); |
341 | 2155 |
2156 if (c == '\\') | |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2157 c = read_escape (readcharfun, 0, &discard); |
17038 | 2158 else if (BASE_LEADING_CODE_P (c)) |
2159 c = read_multibyte (c, readcharfun); | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2160 |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2161 return make_number (c); |
341 | 2162 } |
2163 | |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
2164 case '"': |
341 | 2165 { |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2166 char *p = read_buffer; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2167 char *end = read_buffer + read_buffer_size; |
341 | 2168 register int c; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2169 /* 1 if we saw an escape sequence specifying |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2170 a multibyte character, or a multibyte character. */ |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2171 int force_multibyte = 0; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2172 /* 1 if we saw an escape sequence specifying |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2173 a single-byte character. */ |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2174 int force_singlebyte = 0; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2175 /* 1 if read_buffer contains multibyte text now. */ |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2176 int is_multibyte = 0; |
341 | 2177 int cancel = 0; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2178 int nchars = 0; |
341 | 2179 |
2180 while ((c = READCHAR) >= 0 | |
2181 && c != '\"') | |
2182 { | |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2183 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2184 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2185 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2186 read_buffer = (char *) xrealloc (read_buffer, |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2187 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2188 p = read_buffer + offset; |
341 | 2189 end = read_buffer + read_buffer_size; |
2190 } | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2191 |
341 | 2192 if (c == '\\') |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2193 { |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2194 int byterep; |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2195 |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2196 c = read_escape (readcharfun, 1, &byterep); |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2197 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2198 /* C is -1 if \ newline has just been seen */ |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2199 if (c == -1) |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2200 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2201 if (p == read_buffer) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2202 cancel = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2203 continue; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2204 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2205 |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2206 if (byterep == 1) |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2207 force_singlebyte = 1; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2208 else if (byterep == 2) |
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2209 force_multibyte = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2210 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2211 |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2212 /* A character that must be multibyte forces multibyte. */ |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2213 if (! SINGLE_BYTE_CHAR_P (c & ~CHAR_MODIFIER_MASK)) |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2214 force_multibyte = 1; |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2215 |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2216 /* If we just discovered the need to be multibyte, |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2217 convert the text accumulated thus far. */ |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2218 if (force_multibyte && ! is_multibyte) |
341 | 2219 { |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2220 is_multibyte = 1; |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2221 to_multibyte (&p, &end, &nchars); |
341 | 2222 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2223 |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2224 /* Allow `\C- ' and `\C-?'. */ |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2225 if (c == (CHAR_CTL | ' ')) |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2226 c = 0; |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2227 else if (c == (CHAR_CTL | '?')) |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2228 c = 127; |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2229 |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2230 if (c & CHAR_SHIFT) |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
2231 { |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2232 /* Shift modifier is valid only with [A-Za-z]. */ |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2233 if ((c & 0377) >= 'A' && (c & 0377) <= 'Z') |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2234 c &= ~CHAR_SHIFT; |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2235 else if ((c & 0377) >= 'a' && (c & 0377) <= 'z') |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2236 c = (c & ~CHAR_SHIFT) - ('a' - 'A'); |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
2237 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2238 |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2239 if (c & CHAR_META) |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2240 /* Move the meta bit to the right place for a string. */ |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2241 c = (c & ~CHAR_META) | 0x80; |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2242 if (c & CHAR_MODIFIER_MASK) |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2243 error ("Invalid modifier in string"); |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2244 |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2245 if (is_multibyte) |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2246 p += CHAR_STRING (c, p); |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2247 else |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2248 *p++ = c; |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2249 |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2250 nchars++; |
341 | 2251 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2252 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2253 if (c < 0) |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2254 end_of_file_error (); |
341 | 2255 |
2256 /* If purifying, and string starts with \ newline, | |
2257 return zero instead. This is for doc strings | |
604 | 2258 that we are really going to find in etc/DOC.nn.nn */ |
485 | 2259 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) |
341 | 2260 return make_number (0); |
2261 | |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2262 if (is_multibyte || force_singlebyte) |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2263 ; |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2264 else if (load_convert_to_unibyte) |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2265 { |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2266 Lisp_Object string; |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2267 to_multibyte (&p, &end, &nchars); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2268 if (p - read_buffer != nchars) |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2269 { |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2270 string = make_multibyte_string (read_buffer, nchars, |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2271 p - read_buffer); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2272 return Fstring_make_unibyte (string); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2273 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2274 /* We can make a unibyte string directly. */ |
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2275 is_multibyte = 0; |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2276 } |
22889
beddbcd21407
(read1): In reading a string, treat Qlambda like Qget_file_char.
Richard M. Stallman <rms@gnu.org>
parents:
22691
diff
changeset
|
2277 else if (EQ (readcharfun, Qget_file_char) |
beddbcd21407
(read1): In reading a string, treat Qlambda like Qget_file_char.
Richard M. Stallman <rms@gnu.org>
parents:
22691
diff
changeset
|
2278 || EQ (readcharfun, Qlambda)) |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2279 { |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2280 /* Nowadays, reading directly from a file is used only for |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2281 compiled Emacs Lisp files, and those always use the |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2282 Emacs internal encoding. Meanwhile, Qlambda is used |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2283 for reading dynamic byte code (compiled with |
43669
4bd6b6b21deb
(read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents:
43080
diff
changeset
|
2284 byte-compile-dynamic = t). So make the string multibyte |
4bd6b6b21deb
(read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents:
43080
diff
changeset
|
2285 if the string contains any multibyte sequences. |
4bd6b6b21deb
(read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents:
43080
diff
changeset
|
2286 (to_multibyte is a no-op if not.) */ |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2287 to_multibyte (&p, &end, &nchars); |
43669
4bd6b6b21deb
(read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents:
43080
diff
changeset
|
2288 is_multibyte = (p - read_buffer) != nchars; |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2289 } |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2290 else |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2291 /* In all other cases, if we read these bytes as |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2292 separate characters, treat them as separate characters now. */ |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2293 ; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2294 |
341 | 2295 if (read_pure) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2296 return make_pure_string (read_buffer, nchars, p - read_buffer, |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2297 is_multibyte); |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2298 return make_specified_string (read_buffer, nchars, p - read_buffer, |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2299 is_multibyte); |
341 | 2300 } |
2301 | |
762 | 2302 case '.': |
2303 { | |
2304 int next_char = READCHAR; | |
2305 UNREAD (next_char); | |
2306 | |
28746
42f2ded9d9db
(read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents:
28733
diff
changeset
|
2307 if (next_char <= 040 |
42f2ded9d9db
(read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents:
28733
diff
changeset
|
2308 || index ("\"'`,(", next_char)) |
762 | 2309 { |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2310 *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
|
2311 return Qnil; |
762 | 2312 } |
2313 | |
2314 /* Otherwise, we fall through! Note that the atom-reading loop | |
2315 below will now loop at least once, assuring that we will not | |
2316 try to UNREAD two characters in a row. */ | |
2317 } | |
341 | 2318 default: |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2319 default_label: |
341 | 2320 if (c <= 040) goto retry; |
2321 { | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2322 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
|
2323 int quoted = 0; |
341 | 2324 |
2325 { | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2326 char *end = read_buffer + read_buffer_size; |
341 | 2327 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2328 while (c > 040 |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2329 && !(c == '\"' || c == '\'' || c == ';' |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2330 || c == '(' || c == ')' |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2331 || c == '[' || c == ']' || c == '#')) |
341 | 2332 { |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2333 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2334 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2335 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2336 read_buffer = (char *) xrealloc (read_buffer, |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2337 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2338 p = read_buffer + offset; |
341 | 2339 end = read_buffer + read_buffer_size; |
2340 } | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2341 |
341 | 2342 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
|
2343 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2344 c = READCHAR; |
34604
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2345 if (c == -1) |
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2346 end_of_file_error (); |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2347 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
|
2348 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2349 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2350 if (! SINGLE_BYTE_CHAR_P (c)) |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2351 p += CHAR_STRING (c, p); |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2352 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2353 *p++ = c; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2354 |
341 | 2355 c = READCHAR; |
2356 } | |
2357 | |
2358 if (p == end) | |
2359 { | |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2360 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2361 read_buffer = (char *) xrealloc (read_buffer, |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2362 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2363 p = read_buffer + offset; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2364 end = read_buffer + read_buffer_size; |
341 | 2365 } |
2366 *p = 0; | |
2367 if (c >= 0) | |
2368 UNREAD (c); | |
2369 } | |
2370 | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2371 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
|
2372 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2373 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
|
2374 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
|
2375 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
|
2376 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
|
2377 /* 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
|
2378 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
|
2379 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2380 while (p1 != p && (c = *p1) >= '0' && c <= '9') p1++; |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2381 /* 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
|
2382 if (p1 > read_buffer && p1 < p && *p1 == '.') p1++; |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2383 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
|
2384 /* 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
|
2385 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2386 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
|
2387 p1[-1] = '\0'; |
11699
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2388 if (sizeof (int) == sizeof (EMACS_INT)) |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2389 XSETINT (val, atoi (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2390 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
|
2391 XSETINT (val, atol (read_buffer)); |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2392 else |
eb4b842ee557
(read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents:
11683
diff
changeset
|
2393 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
|
2394 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
|
2395 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2396 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2397 if (isfloat_string (read_buffer)) |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2398 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2399 /* Compute NaN and infinities using 0.0 in a variable, |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2400 to cope with compilers that think they are smarter |
23193
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
2401 than we are. */ |
21636
10d8ced94467
(read1): Compute NaN and infinities using 0.0 in a
Richard M. Stallman <rms@gnu.org>
parents:
21635
diff
changeset
|
2402 double zero = 0.0; |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2403 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2404 double value; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2405 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2406 /* Negate the value ourselves. This treats 0, NaNs, |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2407 and infinity properly on IEEE floating point hosts, |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2408 and works around a common bug where atof ("-0.0") |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2409 drops the sign. */ |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2410 int negative = read_buffer[0] == '-'; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2411 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2412 /* The only way p[-1] can be 'F' or 'N', after isfloat_string |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2413 returns 1, is if the input ends in e+INF or e+NaN. */ |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2414 switch (p[-1]) |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2415 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2416 case 'F': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2417 value = 1.0 / zero; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2418 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2419 case 'N': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2420 value = zero / zero; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2421 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2422 default: |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2423 value = atof (read_buffer + negative); |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2424 break; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2425 } |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2426 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2427 return make_float (negative ? - value : value); |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2428 } |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2429 } |
341 | 2430 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2431 if (uninterned_symbol) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2432 return make_symbol (read_buffer); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2433 else |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2434 return intern (read_buffer); |
341 | 2435 } |
2436 } | |
2437 } | |
2438 | |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2439 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2440 /* List of nodes we've seen during substitute_object_in_subtree. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2441 static Lisp_Object seen_list; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2442 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2443 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2444 substitute_object_in_subtree (object, placeholder) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2445 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2446 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2447 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2448 Lisp_Object check_object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2449 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2450 /* We haven't seen any objects when we start. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2451 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2452 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2453 /* Make all the substitutions. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2454 check_object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2455 = substitute_object_recurse (object, placeholder, object); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2456 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2457 /* Clear seen_list because we're done with it. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2458 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2459 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2460 /* The returned object here is expected to always eq the |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2461 original. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2462 if (!EQ (check_object, object)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2463 error ("Unexpected mutation error in reader"); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2464 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2465 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2466 /* Feval doesn't get called from here, so no gc protection is needed. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2467 #define SUBSTITUTE(get_val, set_val) \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2468 { \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2469 Lisp_Object old_value = get_val; \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2470 Lisp_Object true_value \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2471 = substitute_object_recurse (object, placeholder,\ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2472 old_value); \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2473 \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2474 if (!EQ (old_value, true_value)) \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2475 { \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2476 set_val; \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2477 } \ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2478 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2479 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2480 static Lisp_Object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2481 substitute_object_recurse (object, placeholder, subtree) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2482 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2483 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2484 Lisp_Object subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2485 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2486 /* If we find the placeholder, return the target object. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2487 if (EQ (placeholder, subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2488 return object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2489 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2490 /* If we've been to this node before, don't explore it again. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2491 if (!EQ (Qnil, Fmemq (subtree, seen_list))) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2492 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2493 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2494 /* If this node can be the entry point to a cycle, remember that |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2495 we've seen it. It can only be such an entry point if it was made |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2496 by #n=, which means that we can find it as a value in |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2497 read_objects. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2498 if (!EQ (Qnil, Frassq (subtree, read_objects))) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2499 seen_list = Fcons (subtree, seen_list); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2500 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2501 /* Recurse according to subtree's type. |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2502 Every branch must return a Lisp_Object. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2503 switch (XTYPE (subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2504 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2505 case Lisp_Vectorlike: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2506 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2507 int i; |
28507
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28388
diff
changeset
|
2508 int length = XINT (Flength(subtree)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2509 for (i = 0; i < length; i++) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2510 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2511 Lisp_Object idx = make_number (i); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2512 SUBSTITUTE (Faref (subtree, idx), |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2513 Faset (subtree, idx, true_value)); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2514 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2515 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2516 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2517 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2518 case Lisp_Cons: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2519 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2520 SUBSTITUTE (Fcar_safe (subtree), |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
2521 Fsetcar (subtree, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2522 SUBSTITUTE (Fcdr_safe (subtree), |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
2523 Fsetcdr (subtree, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2524 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2525 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2526 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2527 case Lisp_String: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2528 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2529 /* Check for text properties in each interval. |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
2530 substitute_in_interval contains part of the logic. */ |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2531 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2532 INTERVAL root_interval = XSTRING (subtree)->intervals; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2533 Lisp_Object arg = Fcons (object, placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2534 |
39857
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
2535 traverse_intervals_noorder (root_interval, |
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
2536 &substitute_in_interval, arg); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2537 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2538 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2539 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2540 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2541 /* Other types don't recurse any further. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2542 default: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2543 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2544 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2545 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2546 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2547 /* Helper function for substitute_object_recurse. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2548 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2549 substitute_in_interval (interval, arg) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2550 INTERVAL interval; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2551 Lisp_Object arg; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2552 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2553 Lisp_Object object = Fcar (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2554 Lisp_Object placeholder = Fcdr (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2555 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2556 SUBSTITUTE(interval->plist, interval->plist = true_value); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2557 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2558 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2559 |
341 | 2560 #define LEAD_INT 1 |
2561 #define DOT_CHAR 2 | |
2562 #define TRAIL_INT 4 | |
2563 #define E_CHAR 8 | |
2564 #define EXP_INT 16 | |
2565 | |
2566 int | |
2567 isfloat_string (cp) | |
2568 register char *cp; | |
2569 { | |
21799 | 2570 register int state; |
341 | 2571 |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
2572 char *start = cp; |
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
2573 |
341 | 2574 state = 0; |
2575 if (*cp == '+' || *cp == '-') | |
2576 cp++; | |
2577 | |
9871 | 2578 if (*cp >= '0' && *cp <= '9') |
341 | 2579 { |
2580 state |= LEAD_INT; | |
9871 | 2581 while (*cp >= '0' && *cp <= '9') |
2582 cp++; | |
341 | 2583 } |
2584 if (*cp == '.') | |
2585 { | |
2586 state |= DOT_CHAR; | |
2587 cp++; | |
2588 } | |
9871 | 2589 if (*cp >= '0' && *cp <= '9') |
341 | 2590 { |
2591 state |= TRAIL_INT; | |
9871 | 2592 while (*cp >= '0' && *cp <= '9') |
341 | 2593 cp++; |
2594 } | |
16342
b91af71f45f1
(isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents:
16228
diff
changeset
|
2595 if (*cp == 'e' || *cp == 'E') |
341 | 2596 { |
2597 state |= E_CHAR; | |
2598 cp++; | |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2599 if (*cp == '+' || *cp == '-') |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
2600 cp++; |
341 | 2601 } |
2602 | |
9871 | 2603 if (*cp >= '0' && *cp <= '9') |
341 | 2604 { |
2605 state |= EXP_INT; | |
9871 | 2606 while (*cp >= '0' && *cp <= '9') |
341 | 2607 cp++; |
2608 } | |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
2609 else if (cp == start) |
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
2610 ; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2611 else if (cp[-1] == '+' && cp[0] == 'I' && cp[1] == 'N' && cp[2] == 'F') |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2612 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2613 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2614 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2615 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2616 else if (cp[-1] == '+' && cp[0] == 'N' && cp[1] == 'a' && cp[2] == 'N') |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2617 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2618 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2619 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2620 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2621 |
11172
e1ca77e22c12
(isfloat_string): Permit trailing space.
Richard M. Stallman <rms@gnu.org>
parents:
11079
diff
changeset
|
2622 return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) |
341 | 2623 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) |
826 | 2624 || state == (DOT_CHAR|TRAIL_INT) |
341 | 2625 || state == (LEAD_INT|E_CHAR|EXP_INT) |
826 | 2626 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT) |
2627 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT))); | |
341 | 2628 } |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27645
diff
changeset
|
2629 |
341 | 2630 |
2631 static Lisp_Object | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2632 read_vector (readcharfun, bytecodeflag) |
341 | 2633 Lisp_Object readcharfun; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2634 int bytecodeflag; |
341 | 2635 { |
2636 register int i; | |
2637 register int size; | |
2638 register Lisp_Object *ptr; | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2639 register Lisp_Object tem, item, vector; |
341 | 2640 register struct Lisp_Cons *otem; |
2641 Lisp_Object len; | |
2642 | |
2643 tem = read_list (1, readcharfun); | |
2644 len = Flength (tem); | |
2645 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil)); | |
2646 | |
2647 size = XVECTOR (vector)->size; | |
2648 ptr = XVECTOR (vector)->contents; | |
2649 for (i = 0; i < size; i++) | |
2650 { | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2651 item = Fcar (tem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2652 /* If `load-force-doc-strings' is t when reading a lazily-loaded |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2653 bytecode object, the docstring containing the bytecode and |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2654 constants values must be treated as unibyte and passed to |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2655 Fread, to get the actual bytecode string and constants vector. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2656 if (bytecodeflag && load_force_doc_strings) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2657 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2658 if (i == COMPILED_BYTECODE) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2659 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2660 if (!STRINGP (item)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2661 error ("invalid byte code"); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2662 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2663 /* Delay handling the bytecode slot until we know whether |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2664 it is lazily-loaded (we can tell by whether the |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2665 constants slot is nil). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2666 ptr[COMPILED_CONSTANTS] = item; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2667 item = Qnil; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2668 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2669 else if (i == COMPILED_CONSTANTS) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2670 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2671 Lisp_Object bytestr = ptr[COMPILED_CONSTANTS]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2672 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2673 if (NILP (item)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2674 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2675 /* Coerce string to unibyte (like string-as-unibyte, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2676 but without generating extra garbage and |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2677 guaranteeing no change in the contents). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2678 XSTRING (bytestr)->size = STRING_BYTES (XSTRING (bytestr)); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2679 SET_STRING_BYTES (XSTRING (bytestr), -1); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2680 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2681 item = Fread (bytestr); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2682 if (!CONSP (item)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2683 error ("invalid byte code"); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2684 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2685 otem = XCONS (item); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
2686 bytestr = XCAR (item); |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
2687 item = XCDR (item); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2688 free_cons (otem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2689 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2690 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2691 /* Now handle the bytecode slot. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2692 ptr[COMPILED_BYTECODE] = read_pure ? Fpurecopy (bytestr) : bytestr; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2693 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2694 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2695 ptr[i] = read_pure ? Fpurecopy (item) : item; |
341 | 2696 otem = XCONS (tem); |
2697 tem = Fcdr (tem); | |
2698 free_cons (otem); | |
2699 } | |
2700 return vector; | |
2701 } | |
2702 | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2703 /* FLAG = 1 means check for ] to terminate rather than ) and . |
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2704 FLAG = -1 means check for starting with defun |
341 | 2705 and make structure pure. */ |
2706 | |
2707 static Lisp_Object | |
2708 read_list (flag, readcharfun) | |
2709 int flag; | |
2710 register Lisp_Object readcharfun; | |
2711 { | |
2712 /* -1 means check next element for defun, | |
2713 0 means don't check, | |
2714 1 means already checked and found defun. */ | |
2715 int defunflag = flag < 0 ? -1 : 0; | |
2716 Lisp_Object val, tail; | |
2717 register Lisp_Object elt, tem; | |
2718 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
|
2719 /* 0 is the normal case. |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2720 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
|
2721 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
|
2722 int doc_reference = 0; |
341 | 2723 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2724 /* 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
|
2725 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
|
2726 |
341 | 2727 val = Qnil; |
2728 tail = Qnil; | |
2729 | |
2730 while (1) | |
2731 { | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2732 int ch; |
341 | 2733 GCPRO2 (val, tail); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2734 elt = read1 (readcharfun, &ch, first_in_list); |
341 | 2735 UNGCPRO; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2736 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2737 first_in_list = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2738 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2739 /* 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
|
2740 if (EQ (elt, Vload_file_name) |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
2741 && ! NILP (elt) |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2742 && !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
|
2743 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2744 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
|
2745 /* 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
|
2746 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
|
2747 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
|
2748 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
|
2749 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
|
2750 else |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2751 /* 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
|
2752 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
|
2753 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
|
2754 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
|
2755 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
|
2756 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
|
2757 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
|
2758 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2759 else if (EQ (elt, Vload_file_name) |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
2760 && ! NILP (elt) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2761 && load_force_doc_strings) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2762 doc_reference = 2; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2763 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2764 if (ch) |
341 | 2765 { |
2766 if (flag > 0) | |
2767 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2768 if (ch == ']') |
341 | 2769 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
|
2770 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
|
2771 Fcons (make_string (") or . in a vector", 18), Qnil)); |
341 | 2772 } |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2773 if (ch == ')') |
341 | 2774 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
|
2775 if (ch == '.') |
341 | 2776 { |
2777 GCPRO2 (val, tail); | |
485 | 2778 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
2779 XSETCDR (tail, read0 (readcharfun)); |
341 | 2780 else |
2781 val = read0 (readcharfun); | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2782 read1 (readcharfun, &ch, 0); |
341 | 2783 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
|
2784 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
|
2785 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2786 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
|
2787 return make_number (0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2788 if (doc_reference == 2) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2789 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2790 /* 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
|
2791 If it's in saved_doc_string, get it from there. */ |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
2792 int pos = XINT (XCDR (val)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2793 /* Position is negative for user variables. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2794 if (pos < 0) pos = -pos; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2795 if (pos >= saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2796 && pos < (saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2797 + saved_doc_string_length)) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2798 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2799 int start = pos - saved_doc_string_position; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2800 int from, to; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2801 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2802 /* Process quoting with ^A, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2803 and find the end of the string, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2804 which is marked with ^_ (037). */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2805 for (from = start, to = start; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2806 saved_doc_string[from] != 037;) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2807 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2808 int c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2809 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2810 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2811 c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2812 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2813 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2814 else if (c == '0') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2815 saved_doc_string[to++] = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2816 else if (c == '_') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2817 saved_doc_string[to++] = 037; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2818 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2819 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2820 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2821 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2822 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2823 return make_string (saved_doc_string + start, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2824 to - start); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2825 } |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2826 /* Look in prev_saved_doc_string the same way. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2827 else if (pos >= prev_saved_doc_string_position |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2828 && pos < (prev_saved_doc_string_position |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2829 + prev_saved_doc_string_length)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2830 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2831 int start = pos - prev_saved_doc_string_position; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2832 int from, to; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2833 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2834 /* Process quoting with ^A, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2835 and find the end of the string, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2836 which is marked with ^_ (037). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2837 for (from = start, to = start; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2838 prev_saved_doc_string[from] != 037;) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2839 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2840 int c = prev_saved_doc_string[from++]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2841 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2842 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2843 c = prev_saved_doc_string[from++]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2844 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2845 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2846 else if (c == '0') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2847 prev_saved_doc_string[to++] = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2848 else if (c == '_') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2849 prev_saved_doc_string[to++] = 037; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2850 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2851 else |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2852 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2853 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2854 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2855 return make_string (prev_saved_doc_string + start, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2856 to - start); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2857 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2858 else |
22603
329fe9a2bdb8
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22420
diff
changeset
|
2859 return get_doc_string (val, 0, 0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2860 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2861 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2862 return val; |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
2863 } |
341 | 2864 return Fsignal (Qinvalid_read_syntax, Fcons (make_string (". in wrong context", 18), Qnil)); |
2865 } | |
2866 return Fsignal (Qinvalid_read_syntax, Fcons (make_string ("] in a list", 11), Qnil)); | |
2867 } | |
2868 tem = (read_pure && flag <= 0 | |
2869 ? pure_cons (elt, Qnil) | |
2870 : Fcons (elt, Qnil)); | |
485 | 2871 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
2872 XSETCDR (tail, tem); |
341 | 2873 else |
2874 val = tem; | |
2875 tail = tem; | |
2876 if (defunflag < 0) | |
2877 defunflag = EQ (elt, Qdefun); | |
2878 else if (defunflag > 0) | |
2879 read_pure = 1; | |
2880 } | |
2881 } | |
2882 | |
2883 Lisp_Object Vobarray; | |
2884 Lisp_Object initial_obarray; | |
2885 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2886 /* 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
|
2887 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2888 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
|
2889 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2890 static int hash_string (); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2891 Lisp_Object oblookup (); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2892 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2893 /* 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
|
2894 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
|
2895 |
341 | 2896 Lisp_Object |
2897 check_obarray (obarray) | |
2898 Lisp_Object obarray; | |
2899 { | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2900 while (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 2901 { |
2902 /* If Vobarray is now invalid, force it to be valid. */ | |
2903 if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; | |
2904 | |
2905 obarray = wrong_type_argument (Qvectorp, obarray); | |
2906 } | |
2907 return obarray; | |
2908 } | |
2909 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2910 /* 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
|
2911 interned in the current obarray. */ |
341 | 2912 |
2913 Lisp_Object | |
2914 intern (str) | |
2915 char *str; | |
2916 { | |
2917 Lisp_Object tem; | |
2918 int len = strlen (str); | |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
2919 Lisp_Object obarray; |
341 | 2920 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
2921 obarray = Vobarray; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2922 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 2923 obarray = check_obarray (obarray); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2924 tem = oblookup (obarray, str, len, len); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2925 if (SYMBOLP (tem)) |
341 | 2926 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
|
2927 return Fintern (make_string (str, len), obarray); |
341 | 2928 } |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2929 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2930 /* 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
|
2931 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2932 Lisp_Object |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2933 make_symbol (str) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2934 char *str; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2935 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2936 int len = strlen (str); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2937 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2938 return Fmake_symbol ((!NILP (Vpurify_flag) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2939 ? make_pure_string (str, len, len, 0) |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2940 : make_string (str, len))); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2941 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
2942 |
341 | 2943 DEFUN ("intern", Fintern, Sintern, 1, 2, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2944 doc: /* Return the canonical symbol whose name is STRING. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2945 If there is none, one is created by this function and returned. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2946 A second optional argument specifies the obarray to use; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2947 it defaults to the value of `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2948 (string, obarray) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2949 Lisp_Object string, obarray; |
341 | 2950 { |
2951 register Lisp_Object tem, sym, *ptr; | |
2952 | |
485 | 2953 if (NILP (obarray)) obarray = Vobarray; |
341 | 2954 obarray = check_obarray (obarray); |
2955 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
2956 CHECK_STRING (string); |
341 | 2957 |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2958 tem = oblookup (obarray, XSTRING (string)->data, |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2959 XSTRING (string)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
2960 STRING_BYTES (XSTRING (string))); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
2961 if (!INTEGERP (tem)) |
341 | 2962 return tem; |
2963 | |
485 | 2964 if (!NILP (Vpurify_flag)) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2965 string = Fpurecopy (string); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2966 sym = Fmake_symbol (string); |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2967 |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2968 if (EQ (obarray, initial_obarray)) |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2969 XSYMBOL (sym)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2970 else |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2971 XSYMBOL (sym)->interned = SYMBOL_INTERNED; |
341 | 2972 |
21776
0b8510aab527
(Fintern): Initialize keywords only in initial obarray.
Richard M. Stallman <rms@gnu.org>
parents:
21761
diff
changeset
|
2973 if ((XSTRING (string)->data[0] == ':') |
21982
456f95c03285
(Fintern): Properly compare lisp objects.
Richard M. Stallman <rms@gnu.org>
parents:
21936
diff
changeset
|
2974 && EQ (obarray, initial_obarray)) |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2975 { |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2976 XSYMBOL (sym)->constant = 1; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2977 XSYMBOL (sym)->value = sym; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
2978 } |
17918
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
2979 |
341 | 2980 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
|
2981 if (SYMBOLP (*ptr)) |
341 | 2982 XSYMBOL (sym)->next = XSYMBOL (*ptr); |
2983 else | |
2984 XSYMBOL (sym)->next = 0; | |
2985 *ptr = sym; | |
2986 return sym; | |
2987 } | |
2988 | |
2989 DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2990 doc: /* Return the canonical symbol named NAME, or nil if none exists. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2991 NAME may be a string or a symbol. If it is a symbol, that exact |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2992 symbol is searched for. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2993 A second optional argument specifies the obarray to use; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2994 it defaults to the value of `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
2995 (name, obarray) |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
2996 Lisp_Object name, obarray; |
341 | 2997 { |
2998 register Lisp_Object tem; | |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
2999 struct Lisp_String *string; |
341 | 3000 |
485 | 3001 if (NILP (obarray)) obarray = Vobarray; |
341 | 3002 obarray = check_obarray (obarray); |
3003 | |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3004 if (!SYMBOLP (name)) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3005 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3006 CHECK_STRING (name); |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3007 string = XSTRING (name); |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3008 } |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3009 else |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3010 string = XSYMBOL (name)->name; |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3011 |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3012 tem = oblookup (obarray, string->data, string->size, STRING_BYTES (string)); |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3013 if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem))) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3014 return Qnil; |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3015 else |
341 | 3016 return tem; |
3017 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3018 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3019 DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3020 doc: /* Delete the symbol named NAME, if any, from OBARRAY. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3021 The value is t if a symbol was found and deleted, nil otherwise. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3022 NAME may be a string or a symbol. If it is a symbol, that symbol |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3023 is deleted, if it belongs to OBARRAY--no other symbol is deleted. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3024 OBARRAY defaults to the value of the variable `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3025 (name, obarray) |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3026 Lisp_Object name, obarray; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3027 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3028 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
|
3029 int hash; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3030 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3031 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
|
3032 obarray = check_obarray (obarray); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3033 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3034 if (SYMBOLP (name)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3035 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
|
3036 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3037 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3038 CHECK_STRING (name); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3039 string = name; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3040 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3041 |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3042 tem = oblookup (obarray, XSTRING (string)->data, |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3043 XSTRING (string)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
3044 STRING_BYTES (XSTRING (string))); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3045 if (INTEGERP (tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3046 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3047 /* 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
|
3048 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
|
3049 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3050 |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3051 XSYMBOL (tem)->interned = SYMBOL_UNINTERNED; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3052 XSYMBOL (tem)->constant = 0; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3053 XSYMBOL (tem)->indirect_variable = 0; |
20773
6c655dc99321
(Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
3054 |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3055 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
|
3056 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3057 if (EQ (XVECTOR (obarray)->contents[hash], tem)) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3058 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3059 if (XSYMBOL (tem)->next) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3060 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3061 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3062 XSETINT (XVECTOR (obarray)->contents[hash], 0); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3063 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3064 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3065 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3066 Lisp_Object tail, following; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3067 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3068 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
|
3069 XSYMBOL (tail)->next; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3070 tail = following) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3071 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3072 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
|
3073 if (EQ (following, tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3074 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3075 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
|
3076 break; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3077 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3078 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3079 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3080 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3081 return Qt; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3082 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3083 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3084 /* Return the symbol in OBARRAY whose names matches the string |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3085 of SIZE characters (SIZE_BYTE bytes) at PTR. |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3086 If there is no such symbol in OBARRAY, return nil. |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3087 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3088 Also store the bucket number in oblookup_last_bucket_number. */ |
341 | 3089 |
3090 Lisp_Object | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3091 oblookup (obarray, ptr, size, size_byte) |
341 | 3092 Lisp_Object obarray; |
3093 register char *ptr; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3094 int size, size_byte; |
341 | 3095 { |
8828 | 3096 int hash; |
3097 int obsize; | |
341 | 3098 register Lisp_Object tail; |
3099 Lisp_Object bucket, tem; | |
3100 | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3101 if (!VECTORP (obarray) |
5243 | 3102 || (obsize = XVECTOR (obarray)->size) == 0) |
341 | 3103 { |
3104 obarray = check_obarray (obarray); | |
3105 obsize = XVECTOR (obarray)->size; | |
3106 } | |
13455
4f5a9ce67782
(oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
3107 /* 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
|
3108 obsize &= ~ARRAY_MARK_FLAG; |
341 | 3109 /* Combining next two lines breaks VMS C 2.3. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3110 hash = hash_string (ptr, size_byte); |
341 | 3111 hash %= obsize; |
3112 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
|
3113 oblookup_last_bucket_number = hash; |
341 | 3114 if (XFASTINT (bucket) == 0) |
3115 ; | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3116 else if (!SYMBOLP (bucket)) |
341 | 3117 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
|
3118 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3119 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next)) |
341 | 3120 { |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21220
diff
changeset
|
3121 if (STRING_BYTES (XSYMBOL (tail)->name) == size_byte |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3122 && XSYMBOL (tail)->name->size == size |
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3123 && !bcmp (XSYMBOL (tail)->name->data, ptr, size_byte)) |
341 | 3124 return tail; |
3125 else if (XSYMBOL (tail)->next == 0) | |
3126 break; | |
3127 } | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3128 XSETINT (tem, hash); |
341 | 3129 return tem; |
3130 } | |
3131 | |
3132 static int | |
3133 hash_string (ptr, len) | |
3134 unsigned char *ptr; | |
3135 int len; | |
3136 { | |
3137 register unsigned char *p = ptr; | |
3138 register unsigned char *end = p + len; | |
3139 register unsigned char c; | |
3140 register int hash = 0; | |
3141 | |
3142 while (p != end) | |
3143 { | |
3144 c = *p++; | |
3145 if (c >= 0140) c -= 40; | |
3146 hash = ((hash<<3) + (hash>>28) + c); | |
3147 } | |
3148 return hash & 07777777777; | |
3149 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3150 |
341 | 3151 void |
3152 map_obarray (obarray, fn, arg) | |
3153 Lisp_Object obarray; | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3154 void (*fn) P_ ((Lisp_Object, Lisp_Object)); |
341 | 3155 Lisp_Object arg; |
3156 { | |
3157 register int i; | |
3158 register Lisp_Object tail; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3159 CHECK_VECTOR (obarray); |
341 | 3160 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--) |
3161 { | |
3162 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
|
3163 if (SYMBOLP (tail)) |
341 | 3164 while (1) |
3165 { | |
3166 (*fn) (tail, arg); | |
3167 if (XSYMBOL (tail)->next == 0) | |
3168 break; | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3169 XSETSYMBOL (tail, XSYMBOL (tail)->next); |
341 | 3170 } |
3171 } | |
3172 } | |
3173 | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3174 void |
341 | 3175 mapatoms_1 (sym, function) |
3176 Lisp_Object sym, function; | |
3177 { | |
3178 call1 (function, sym); | |
3179 } | |
3180 | |
3181 DEFUN ("mapatoms", Fmapatoms, Smapatoms, 1, 2, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3182 doc: /* Call FUNCTION on every symbol in OBARRAY. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3183 OBARRAY defaults to the value of `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3184 (function, obarray) |
341 | 3185 Lisp_Object function, obarray; |
3186 { | |
485 | 3187 if (NILP (obarray)) obarray = Vobarray; |
341 | 3188 obarray = check_obarray (obarray); |
3189 | |
3190 map_obarray (obarray, mapatoms_1, function); | |
3191 return Qnil; | |
3192 } | |
3193 | |
5117
951396781a0e
(OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents:
5017
diff
changeset
|
3194 #define OBARRAY_SIZE 1511 |
341 | 3195 |
3196 void | |
3197 init_obarray () | |
3198 { | |
3199 Lisp_Object oblength; | |
3200 int hash; | |
3201 Lisp_Object *tem; | |
3202 | |
9313
ed68c3822e4b
(read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9274
diff
changeset
|
3203 XSETFASTINT (oblength, OBARRAY_SIZE); |
341 | 3204 |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3205 Qnil = Fmake_symbol (make_pure_string ("nil", 3, 3, 0)); |
341 | 3206 Vobarray = Fmake_vector (oblength, make_number (0)); |
3207 initial_obarray = Vobarray; | |
3208 staticpro (&initial_obarray); | |
3209 /* Intern nil in the obarray */ | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3210 XSYMBOL (Qnil)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3211 XSYMBOL (Qnil)->constant = 1; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3212 |
341 | 3213 /* These locals are to kludge around a pyramid compiler bug. */ |
3214 hash = hash_string ("nil", 3); | |
3215 /* Separate statement here to avoid VAXC bug. */ | |
3216 hash %= OBARRAY_SIZE; | |
3217 tem = &XVECTOR (Vobarray)->contents[hash]; | |
3218 *tem = Qnil; | |
3219 | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3220 Qunbound = Fmake_symbol (make_pure_string ("unbound", 7, 7, 0)); |
341 | 3221 XSYMBOL (Qnil)->function = Qunbound; |
3222 XSYMBOL (Qunbound)->value = Qunbound; | |
3223 XSYMBOL (Qunbound)->function = Qunbound; | |
3224 | |
3225 Qt = intern ("t"); | |
3226 XSYMBOL (Qnil)->value = Qnil; | |
3227 XSYMBOL (Qnil)->plist = Qnil; | |
3228 XSYMBOL (Qt)->value = Qt; | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3229 XSYMBOL (Qt)->constant = 1; |
341 | 3230 |
3231 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */ | |
3232 Vpurify_flag = Qt; | |
3233 | |
3234 Qvariable_documentation = intern ("variable-documentation"); | |
16228
fa7a56c543df
(init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents:
16165
diff
changeset
|
3235 staticpro (&Qvariable_documentation); |
341 | 3236 |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
3237 read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH; |
27852
98f55bbdbbad
(Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents:
27763
diff
changeset
|
3238 read_buffer = (char *) xmalloc (read_buffer_size); |
341 | 3239 } |
3240 | |
3241 void | |
3242 defsubr (sname) | |
3243 struct Lisp_Subr *sname; | |
3244 { | |
3245 Lisp_Object sym; | |
3246 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
|
3247 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3248 } |
3249 | |
3250 #ifdef NOTDEF /* use fset in subr.el now */ | |
3251 void | |
3252 defalias (sname, string) | |
3253 struct Lisp_Subr *sname; | |
3254 char *string; | |
3255 { | |
3256 Lisp_Object sym; | |
3257 sym = intern (string); | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3258 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3259 } |
3260 #endif /* NOTDEF */ | |
3261 | |
3262 /* 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
|
3263 to a C variable of type int. Sample call: */ |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3264 /* DEFVAR_INT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */ |
341 | 3265 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3266 defvar_int (namestring, address) |
341 | 3267 char *namestring; |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43700
diff
changeset
|
3268 EMACS_INT *address; |
341 | 3269 { |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3270 Lisp_Object sym, val; |
341 | 3271 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
|
3272 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3273 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
|
3274 XINTFWD (val)->intvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3275 SET_SYMBOL_VALUE (sym, val); |
341 | 3276 } |
3277 | |
42206 | 3278 /* Similar but define a variable whose value is t if address contains 1, |
3279 nil if address contains 0 */ | |
341 | 3280 void |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3281 defvar_bool (namestring, address) |
341 | 3282 char *namestring; |
3283 int *address; | |
3284 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3285 Lisp_Object sym, val; |
341 | 3286 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
|
3287 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3288 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
|
3289 XBOOLFWD (val)->boolvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3290 SET_SYMBOL_VALUE (sym, val); |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
3291 Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars); |
341 | 3292 } |
3293 | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3294 /* 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
|
3295 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
|
3296 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
|
3297 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
|
3298 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
|
3299 void |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3300 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
|
3301 char *namestring; |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3302 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
|
3303 { |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3304 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
|
3305 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
|
3306 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3307 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
|
3308 XOBJFWD (val)->objvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3309 SET_SYMBOL_VALUE (sym, val); |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3310 } |
341 | 3311 |
3312 void | |
7765
688637ba31c5
(defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents:
7675
diff
changeset
|
3313 defvar_lisp (namestring, address) |
341 | 3314 char *namestring; |
3315 Lisp_Object *address; | |
3316 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3317 defvar_lisp_nopro (namestring, address); |
341 | 3318 staticpro (address); |
3319 } | |
3320 | |
3321 /* 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
|
3322 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
|
3323 that is current now. */ |
341 | 3324 |
3325 void | |
1009
bf78b5ea9b3a
* lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents:
851
diff
changeset
|
3326 defvar_per_buffer (namestring, address, type, doc) |
341 | 3327 char *namestring; |
3328 Lisp_Object *address; | |
1009
bf78b5ea9b3a
* lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents:
851
diff
changeset
|
3329 Lisp_Object type; |
341 | 3330 char *doc; |
3331 { | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3332 Lisp_Object sym, val; |
341 | 3333 int offset; |
3334 extern struct buffer buffer_local_symbols; | |
3335 | |
3336 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
|
3337 val = allocate_misc (); |
341 | 3338 offset = (char *)address - (char *)current_buffer; |
3339 | |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3340 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
|
3341 XBUFFER_OBJFWD (val)->offset = offset; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3342 SET_SYMBOL_VALUE (sym, val); |
28367
27133646d187
Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents:
28318
diff
changeset
|
3343 PER_BUFFER_SYMBOL (offset) = sym; |
27133646d187
Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents:
28318
diff
changeset
|
3344 PER_BUFFER_TYPE (offset) = type; |
28318
ff71c3a83b75
(defvar_per_buffer): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
28309
diff
changeset
|
3345 |
28367
27133646d187
Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents:
28318
diff
changeset
|
3346 if (PER_BUFFER_IDX (offset) == 0) |
341 | 3347 /* Did a DEFVAR_PER_BUFFER without initializing the corresponding |
3348 slot of buffer_local_flags */ | |
3349 abort (); | |
3350 } | |
3351 | |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3352 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3353 /* 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
|
3354 at a particular offset in the current kboard object. */ |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3355 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3356 void |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
3357 defvar_kboard (namestring, offset) |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3358 char *namestring; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3359 int offset; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3360 { |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3361 Lisp_Object sym, val; |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3362 sym = intern (namestring); |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3363 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3364 XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd; |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
3365 XKBOARD_OBJFWD (val)->offset = offset; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3366 SET_SYMBOL_VALUE (sym, val); |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3367 } |
341 | 3368 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3369 /* 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
|
3370 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
|
3371 static Lisp_Object dump_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3372 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3373 void |
364 | 3374 init_lread () |
341 | 3375 { |
617 | 3376 char *normal; |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3377 int turn_off_warning = 0; |
341 | 3378 |
364 | 3379 /* Compute the default load-path. */ |
617 | 3380 #ifdef CANNOT_DUMP |
3381 normal = PATH_LOADSEARCH; | |
638 | 3382 Vload_path = decode_env_path (0, normal); |
617 | 3383 #else |
3384 if (NILP (Vpurify_flag)) | |
3385 normal = PATH_LOADSEARCH; | |
3386 else | |
3387 normal = PATH_DUMPLOADSEARCH; | |
3388 | |
3389 /* In a dumped Emacs, we normally have to reset the value of | |
3390 Vload_path from PATH_LOADSEARCH, since the value that was dumped | |
3391 uses ../lisp, instead of the path of the installed elisp | |
3392 libraries. However, if it appears that Vload_path was changed | |
3393 from the default before dumping, don't override that value. */ | |
621 | 3394 if (initialized) |
3395 { | |
3396 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
|
3397 { |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3398 Vload_path = decode_env_path (0, normal); |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3399 if (!NILP (Vinstallation_directory)) |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3400 { |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3401 Lisp_Object tem, tem1, sitelisp; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3402 |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3403 /* Remove site-lisp dirs from path temporarily and store |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3404 them in sitelisp, then conc them on at the end so |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3405 they're always first in path. */ |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3406 sitelisp = Qnil; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3407 while (1) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3408 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3409 tem = Fcar (Vload_path); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3410 tem1 = Fstring_match (build_string ("site-lisp"), |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3411 tem, Qnil); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3412 if (!NILP (tem1)) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3413 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3414 Vload_path = Fcdr (Vload_path); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3415 sitelisp = Fcons (tem, sitelisp); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3416 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3417 else |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3418 break; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3419 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3420 |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3421 /* 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
|
3422 installation dir, if it exists. */ |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3423 tem = Fexpand_file_name (build_string ("lisp"), |
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3424 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
|
3425 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
|
3426 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
|
3427 { |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3428 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
|
3429 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3430 turn_off_warning = 1; |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3431 Vload_path = Fcons (tem, Vload_path); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3432 } |
7004
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3433 } |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3434 else |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
3435 /* 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
|
3436 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
|
3437 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
|
3438 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3439 /* 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
|
3440 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
|
3441 Vinstallation_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3442 tem1 = Ffile_exists_p (tem); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3443 if (!NILP (tem1)) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3444 { |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3445 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3446 Vload_path = Fcons (tem, Vload_path); |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3447 } |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3448 |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3449 /* 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
|
3450 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
|
3451 Vinstallation_directory); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3452 tem1 = Ffile_exists_p (tem); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3453 if (!NILP (tem1)) |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3454 { |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3455 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3456 Vload_path = Fcons (tem, Vload_path); |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
3457 } |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3458 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3459 /* 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
|
3460 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
|
3461 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
|
3462 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3463 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
|
3464 { |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3465 Lisp_Object tem2; |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3466 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3467 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
|
3468 Vinstallation_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3469 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
|
3470 |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3471 /* 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
|
3472 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
|
3473 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
|
3474 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
|
3475 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
|
3476 Vinstallation_directory); |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
3477 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
|
3478 if (!NILP (tem1) && NILP (tem2)) |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3479 { |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3480 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
|
3481 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3482 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3483 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3484 Vload_path = Fcons (tem, Vload_path); |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3485 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3486 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
|
3487 Vsource_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3488 |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3489 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3490 Vload_path = Fcons (tem, Vload_path); |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
3491 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3492 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
|
3493 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3494 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3495 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3496 Vload_path = Fcons (tem, Vload_path); |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3497 } |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
3498 } |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3499 if (!NILP (sitelisp)) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3500 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path); |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3501 } |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3502 } |
621 | 3503 } |
3504 else | |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3505 { |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
3506 /* 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
|
3507 /* 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
|
3508 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
|
3509 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
|
3510 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
|
3511 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
|
3512 dump_path = Vload_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3513 } |
364 | 3514 #endif |
3515 | |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
3516 #ifndef WINDOWSNT |
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
3517 /* 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
|
3518 almost never correct, thereby causing a warning to be printed out that |
14036 | 3519 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
|
3520 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
|
3521 |
341 | 3522 /* 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
|
3523 if (!turn_off_warning) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3524 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3525 Lisp_Object path_tail; |
341 | 3526 |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3527 for (path_tail = Vload_path; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3528 !NILP (path_tail); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3529 path_tail = XCDR (path_tail)) |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3530 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3531 Lisp_Object dirfile; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3532 dirfile = Fcar (path_tail); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3533 if (STRINGP (dirfile)) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3534 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3535 dirfile = Fdirectory_file_name (dirfile); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3536 if (access (XSTRING (dirfile)->data, 0) < 0) |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3537 dir_warning ("Warning: Lisp directory `%s' does not exist.\n", |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3538 XCAR (path_tail)); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3539 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3540 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3541 } |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
3542 #endif /* WINDOWSNT */ |
617 | 3543 |
3544 /* If the EMACSLOADPATH environment variable is set, use its value. | |
3545 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
|
3546 #ifndef CANNOT_DUMP |
617 | 3547 if (NILP (Vpurify_flag) |
3548 && egetenv ("EMACSLOADPATH")) | |
11955
d972c95e7577
(init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11868
diff
changeset
|
3549 #endif |
364 | 3550 Vload_path = decode_env_path ("EMACSLOADPATH", normal); |
3551 | |
3552 Vvalues = Qnil; | |
3553 | |
341 | 3554 load_in_progress = 0; |
15283
b2be450a8da4
(init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
15091
diff
changeset
|
3555 Vload_file_name = Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
3556 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
3557 load_descriptor_list = Qnil; |
21291
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
3558 |
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
3559 Vstandard_input = Qt; |
31536
76cf765a7dad
(init_lread): Set Vloads_in_progress to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
31534
diff
changeset
|
3560 Vloads_in_progress = Qnil; |
341 | 3561 } |
3562 | |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3563 /* 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
|
3564 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
|
3565 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3566 void |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3567 dir_warning (format, dirname) |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3568 char *format; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3569 Lisp_Object dirname; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3570 { |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3571 char *buffer |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3572 = (char *) alloca (XSTRING (dirname)->size + strlen (format) + 5); |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3573 |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3574 fprintf (stderr, format, XSTRING (dirname)->data); |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3575 sprintf (buffer, format, XSTRING (dirname)->data); |
21736
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
3576 /* Don't log the warning before we've initialized!! */ |
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
3577 if (initialized) |
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
3578 message_dolog (buffer, strlen (buffer), 0, STRING_MULTIBYTE (dirname)); |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3579 } |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
3580 |
341 | 3581 void |
364 | 3582 syms_of_lread () |
341 | 3583 { |
3584 defsubr (&Sread); | |
3585 defsubr (&Sread_from_string); | |
3586 defsubr (&Sintern); | |
3587 defsubr (&Sintern_soft); | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3588 defsubr (&Sunintern); |
341 | 3589 defsubr (&Sload); |
672 | 3590 defsubr (&Seval_buffer); |
341 | 3591 defsubr (&Seval_region); |
3592 defsubr (&Sread_char); | |
3593 defsubr (&Sread_char_exclusive); | |
3594 defsubr (&Sread_event); | |
3595 defsubr (&Sget_file_char); | |
3596 defsubr (&Smapatoms); | |
3597 | |
3598 DEFVAR_LISP ("obarray", &Vobarray, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3599 doc: /* Symbol table for use by `intern' and `read'. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3600 It is a vector whose length ought to be prime for best results. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3601 The vector's contents don't make sense if examined from Lisp programs; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3602 to find all the symbols in an obarray, use `mapatoms'. */); |
341 | 3603 |
3604 DEFVAR_LISP ("values", &Vvalues, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3605 doc: /* List of values of all expressions which were read, evaluated and printed. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3606 Order is reverse chronological. */); |
341 | 3607 |
3608 DEFVAR_LISP ("standard-input", &Vstandard_input, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3609 doc: /* Stream for read to get input from. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3610 See documentation of `read' for possible values. */); |
341 | 3611 Vstandard_input = Qt; |
3612 | |
3613 DEFVAR_LISP ("load-path", &Vload_path, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3614 doc: /* *List of directories to search for files to load. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3615 Each element is a string (directory name) or nil (try default directory). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3616 Initialized based on EMACSLOADPATH environment variable, if any, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3617 otherwise to default specified by file `epaths.h' when Emacs was built. */); |
341 | 3618 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3619 DEFVAR_LISP ("load-suffixes", &Vload_suffixes, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3620 doc: /* *List of suffixes to try for files to load. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3621 This list should not include the empty string. */); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3622 Vload_suffixes = Fcons (build_string (".elc"), |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3623 Fcons (build_string (".el"), Qnil)); |
39809
57070445ceac
(syms_of_lread): Fix init of default_suffixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39808
diff
changeset
|
3624 /* We don't use empty_string because it's not initialized yet. */ |
57070445ceac
(syms_of_lread): Fix init of default_suffixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39808
diff
changeset
|
3625 default_suffixes = Fcons (build_string (""), Qnil); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3626 staticpro (&default_suffixes); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3627 |
341 | 3628 DEFVAR_BOOL ("load-in-progress", &load_in_progress, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3629 doc: /* Non-nil iff inside of `load'. */); |
341 | 3630 |
3631 DEFVAR_LISP ("after-load-alist", &Vafter_load_alist, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3632 doc: /* An alist of expressions to be evalled when particular files are loaded. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3633 Each element looks like (FILENAME FORMS...). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3634 When `load' is run and the file-name argument is FILENAME, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3635 the FORMS in the corresponding element are executed at the end of loading. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3636 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3637 FILENAME must match exactly! Normally FILENAME is the name of a library, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3638 with no directory specified, since that is how `load' is normally called. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3639 An error in FORMS does not undo the load, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3640 but does prevent execution of the rest of the FORMS. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3641 FILENAME can also be a symbol (a feature) and FORMS are then executed |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3642 when the corresponding call to `provide' is made. */); |
341 | 3643 Vafter_load_alist = Qnil; |
3644 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
3645 DEFVAR_LISP ("load-history", &Vload_history, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3646 doc: /* Alist mapping source file names to symbols and features. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3647 Each alist element is a list that starts with a file name, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3648 except for one element (optional) that starts with nil and describes |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3649 definitions evaluated from buffers not visiting files. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3650 The remaining elements of each list are symbols defined as functions |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3651 or variables, and cons cells `(provide . FEATURE)', `(require . FEATURE)', |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3652 and `(autoload . SYMBOL)'. */); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
3653 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
|
3654 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3655 DEFVAR_LISP ("load-file-name", &Vload_file_name, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3656 doc: /* Full name of file being loaded by `load'. */); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3657 Vload_file_name = Qnil; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3658 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
3659 DEFVAR_LISP ("user-init-file", &Vuser_init_file, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3660 doc: /* File name, including directory, of user's initialization file. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3661 If the file loaded had extension `.elc' and there was a corresponding `.el' |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3662 file, this variable contains the name of the .el file, suitable for use |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3663 by functions like `custom-save-all' which edit the init file. */); |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
3664 Vuser_init_file = Qnil; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
3665 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
3666 DEFVAR_LISP ("current-load-list", &Vcurrent_load_list, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3667 doc: /* Used for internal purposes by `load'. */); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
3668 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
|
3669 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
3670 DEFVAR_LISP ("load-read-function", &Vload_read_function, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3671 doc: /* Function used by `load' and `eval-region' for reading expressions. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3672 The default is nil, which means use the function `read'. */); |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
3673 Vload_read_function = Qnil; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
3674 |
17038 | 3675 DEFVAR_LISP ("load-source-file-function", &Vload_source_file_function, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3676 doc: /* Function called in `load' for loading an Emacs lisp source file. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3677 This function is for doing code conversion before reading the source file. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3678 If nil, loading is done without any code conversion. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3679 Arguments are FULLNAME, FILE, NOERROR, NOMESSAGE, where |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3680 FULLNAME is the full name of FILE. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3681 See `load' for the meaning of the remaining arguments. */); |
17038 | 3682 Vload_source_file_function = Qnil; |
3683 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3684 DEFVAR_BOOL ("load-force-doc-strings", &load_force_doc_strings, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3685 doc: /* Non-nil means `load' should force-load all dynamic doc strings. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3686 This is useful when the file being loaded is a temporary copy. */); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3687 load_force_doc_strings = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3688 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
3689 DEFVAR_BOOL ("load-convert-to-unibyte", &load_convert_to_unibyte, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3690 doc: /* Non-nil means `read' converts strings to unibyte whenever possible. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3691 This is normally bound by `load' and `eval-buffer' to control `read', |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3692 and is not meant for users to change. */); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
3693 load_convert_to_unibyte = 0; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
3694 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
3695 DEFVAR_LISP ("source-directory", &Vsource_directory, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3696 doc: /* Directory in which Emacs sources were found when Emacs was built. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3697 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
|
3698 Vsource_directory |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3699 = Fexpand_file_name (build_string ("../"), |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3700 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH))); |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3701 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
3702 DEFVAR_LISP ("preloaded-file-list", &Vpreloaded_file_list, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3703 doc: /* List of files that were preloaded (when dumping Emacs). */); |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
3704 Vpreloaded_file_list = Qnil; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
3705 |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
3706 DEFVAR_LISP ("byte-boolean-vars", &Vbyte_boolean_vars, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3707 doc: /* List of all DEFVAR_BOOL variables, used by the byte code optimizer. */); |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
3708 Vbyte_boolean_vars = Qnil; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
3709 |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
3710 DEFVAR_BOOL ("load-dangerous-libraries", &load_dangerous_libraries, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3711 doc: /* Non-nil means load dangerous compiled Lisp files. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3712 Some versions of XEmacs use different byte codes than Emacs. These |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3713 incompatible byte codes can make Emacs crash when it tries to execute |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3714 them. */); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
3715 load_dangerous_libraries = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
3716 |
31367
22eb2b661cdf
(syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents:
31315
diff
changeset
|
3717 DEFVAR_LISP ("bytecomp-version-regexp", &Vbytecomp_version_regexp, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3718 doc: /* Regular expression matching safe to load compiled Lisp files. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3719 When Emacs loads a compiled Lisp file, it reads the first 512 bytes |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3720 from the file, and matches them against this regular expression. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3721 When the regular expression matches, the file is considered to be safe |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3722 to load. See also `load-dangerous-libraries'. */); |
31367
22eb2b661cdf
(syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents:
31315
diff
changeset
|
3723 Vbytecomp_version_regexp |
31464
2efc0e152012
(syms_of_lread): Change value of regexp
Gerd Moellmann <gerd@gnu.org>
parents:
31367
diff
changeset
|
3724 = build_string ("^;;;.\\(in Emacs version\\|bytecomp version FSF\\)"); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
3725 |
14300
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3726 /* Vsource_directory was initialized in init_lread. */ |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3727 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
3728 load_descriptor_list = Qnil; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
3729 staticpro (&load_descriptor_list); |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
3730 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
3731 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
|
3732 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
|
3733 |
341 | 3734 Qstandard_input = intern ("standard-input"); |
3735 staticpro (&Qstandard_input); | |
3736 | |
3737 Qread_char = intern ("read-char"); | |
3738 staticpro (&Qread_char); | |
3739 | |
3740 Qget_file_char = intern ("get-file-char"); | |
3741 staticpro (&Qget_file_char); | |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
3742 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3743 Qbackquote = intern ("`"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3744 staticpro (&Qbackquote); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3745 Qcomma = intern (","); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3746 staticpro (&Qcomma); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3747 Qcomma_at = intern (",@"); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3748 staticpro (&Qcomma_at); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3749 Qcomma_dot = intern (",."); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3750 staticpro (&Qcomma_dot); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3751 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
3752 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
|
3753 staticpro (&Qinhibit_file_name_operation); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
3754 |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
3755 Qascii_character = intern ("ascii-character"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
3756 staticpro (&Qascii_character); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
3757 |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
3758 Qfunction = intern ("function"); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
3759 staticpro (&Qfunction); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
3760 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
3761 Qload = intern ("load"); |
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
3762 staticpro (&Qload); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3763 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3764 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
|
3765 staticpro (&Qload_file_name); |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3766 |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3767 staticpro (&dump_path); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3768 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3769 staticpro (&read_objects); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3770 read_objects = Qnil; |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3771 staticpro (&seen_list); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3772 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
3773 Vloads_in_progress = Qnil; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
3774 staticpro (&Vloads_in_progress); |
341 | 3775 } |