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