Mercurial > emacs
annotate src/lread.c @ 110547:a6fc92a6d443
Fix int/EMACS_INT use in callproc.c.
callproc.c (Fcall_process): Use EMACS_INT for count of
characters read from the subprocess.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 24 Sep 2010 09:32:25 -0400 |
parents | 8e5fcc5dd96b |
children | 3b57f0a3b766 |
rev | line source |
---|---|
341 | 1 /* Lisp parsing and input streams. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64536
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64536
diff
changeset
|
3 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
106815 | 4 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
341 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
341 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
11 (at your option) any later version. |
341 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94696
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
341 | 20 |
21 | |
7898 | 22 #include <config.h> |
341 | 23 #include <stdio.h> |
24 #include <sys/types.h> | |
25 #include <sys/stat.h> | |
26 #include <sys/file.h> | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
27 #include <errno.h> |
83449
ff74a86c2b16
Overhaul and simplify single_kboard API. Allow calls to `recursive-edit' in process filters. Small fixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
28 #include <setjmp.h> |
341 | 29 #include "lisp.h" |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
30 #include "intervals.h" |
341 | 31 #include "buffer.h" |
88383 | 32 #include "character.h" |
17038 | 33 #include "charset.h" |
88886 | 34 #include "coding.h" |
24412
d11ac02f9d6a
Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents:
23933
diff
changeset
|
35 #include <epaths.h> |
341 | 36 #include "commands.h" |
1591
765cb54fa9af
* lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1519
diff
changeset
|
37 #include "keyboard.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
38 #include "frame.h" |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
39 #include "termhooks.h" |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
40 #include "coding.h" |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
41 #include "blockinput.h" |
341 | 42 |
14972
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
43 #ifdef MSDOS |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
44 #include "msdos.h" |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
45 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
46 |
21799 | 47 #ifdef HAVE_UNISTD_H |
48 #include <unistd.h> | |
49 #endif | |
50 | |
341 | 51 #include <math.h> |
52 | |
14950 | 53 #ifdef HAVE_SETLOCALE |
54 #include <locale.h> | |
55 #endif /* HAVE_SETLOCALE */ | |
56 | |
51398 | 57 #ifdef HAVE_FCNTL_H |
58 #include <fcntl.h> | |
59 #endif | |
8596 | 60 #ifndef O_RDONLY |
61 #define O_RDONLY 0 | |
62 #endif | |
63 | |
34428
b2ec0cbfd60a
(file_offset, file_tell): Depend on HAVE_FSEEKO, not
Gerd Moellmann <gerd@gnu.org>
parents:
34362
diff
changeset
|
64 #ifdef HAVE_FSEEKO |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
65 #define file_offset off_t |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
66 #define file_tell ftello |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
67 #else |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
68 #define file_offset long |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
69 #define file_tell ftell |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
70 #endif |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
71 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
72 /* hash table read constants */ |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
73 Lisp_Object Qhash_table, Qdata; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
74 Lisp_Object Qtest, Qsize; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
75 Lisp_Object Qweakness; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
76 Lisp_Object Qrehash_size; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
77 Lisp_Object Qrehash_threshold; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
78 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
79 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; |
341 | 80 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
|
81 Lisp_Object Qascii_character, Qload, Qload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
82 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
|
83 Lisp_Object Qinhibit_file_name_operation; |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
84 Lisp_Object Qeval_buffer_list, Veval_buffer_list; |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
85 Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
86 |
88886 | 87 /* Used instead of Qget_file_char while loading *.elc files compiled |
88 by Emacs 21 or older. */ | |
89 static Lisp_Object Qget_emacs_mule_file_char; | |
90 | |
91 static Lisp_Object Qload_force_doc_strings; | |
92 | |
78501 | 93 /* non-zero if inside `load' */ |
341 | 94 int load_in_progress; |
104059
3750eeb20ab9
* lread.c: Rewrite 2009-07-21 changes.
Ken Raeburn <raeburn@raeburn.org>
parents:
104006
diff
changeset
|
95 static Lisp_Object Qload_in_progress; |
104006
b426d08d0ba3
(load_depth): New variable.
Ken Raeburn <raeburn@raeburn.org>
parents:
103101
diff
changeset
|
96 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
97 /* Directory in which the sources were found. */ |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
98 Lisp_Object Vsource_directory; |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
99 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
100 /* Search path and suffixes for files to be loaded. */ |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
101 Lisp_Object Vload_path, Vload_suffixes, Vload_file_rep_suffixes; |
341 | 102 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
103 /* File name of user's init file. */ |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
104 Lisp_Object Vuser_init_file; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
105 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
106 /* 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
|
107 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
|
108 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
|
109 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
110 /* 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
|
111 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
|
112 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
113 /* List of files that were preloaded. */ |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
114 Lisp_Object Vpreloaded_file_list; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
115 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
116 /* 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
|
117 Lisp_Object Vload_file_name; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
118 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
119 /* 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
|
120 Lisp_Object Vload_read_function; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
121 |
103101
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
122 /* Non-nil means read recursive structures using #n= and #n# syntax. */ |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
123 Lisp_Object Vread_circle; |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
124 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
125 /* 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
|
126 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
|
127 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
|
128 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
|
129 Lisp_Object read_objects; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
130 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
131 /* 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
|
132 static int load_force_doc_strings; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
133 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
134 /* 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
|
135 static int load_convert_to_unibyte; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
136 |
88886 | 137 /* Nonzero means READCHAR should read bytes one by one (not character) |
138 when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char. | |
139 This is set to 1 by read1 temporarily while handling #@NUMBER. */ | |
140 static int load_each_byte; | |
141 | |
73800
4d1706442c96
(syms_of_lread): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
72132
diff
changeset
|
142 /* Function to use for loading an Emacs Lisp source file (not |
17038 | 143 compiled) instead of readevalloop. */ |
144 Lisp_Object Vload_source_file_function; | |
145 | |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
146 /* List of all DEFVAR_BOOL variables. Used by the byte optimizer. */ |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
147 Lisp_Object Vbyte_boolean_vars; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
148 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
149 /* Whether or not to add a `read-positions' property to symbols |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
150 read. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
151 Lisp_Object Vread_with_symbol_positions; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
152 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
153 /* List of (SYMBOL . POSITION) accumulated so far. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
154 Lisp_Object Vread_symbol_positions_list; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
155 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
156 /* 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
|
157 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
|
158 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
159 /* File for get_file_char to read from. Use by load. */ |
341 | 160 static FILE *instream; |
161 | |
162 /* When nonzero, read conses in pure space */ | |
163 static int read_pure; | |
164 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
165 /* For use within read-from-string (this reader is non-reentrant!!) */ |
341 | 166 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
|
167 static int read_from_string_index_byte; |
341 | 168 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
|
169 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
170 /* Number of characters read in the current call to Fread or |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
171 Fread_from_string. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
172 static int readchar_count; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
173 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
174 /* This contains the last string skipped with #@. */ |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
175 static char *saved_doc_string; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
176 /* Length of buffer allocated in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
177 static int saved_doc_string_size; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
178 /* Length of actual data in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
179 static int saved_doc_string_length; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
180 /* This is the file position that string came from. */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
181 static file_offset saved_doc_string_position; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
182 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
183 /* 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
|
184 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
|
185 is put in saved_doc_string. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
186 static char *prev_saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
187 /* 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
|
188 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
|
189 /* 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
|
190 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
|
191 /* This is the file position that string came from. */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
192 static file_offset prev_saved_doc_string_position; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
193 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
194 /* 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
|
195 with no surrounding parentheses. |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
196 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
|
197 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
|
198 static int new_backquote_flag; |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
199 static Lisp_Object Vold_style_backquotes, Qold_style_backquotes; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
200 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
201 /* A list of file names for files being loaded in Fload. Used to |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
202 check for recursive loads. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
203 |
61623
eac490378ade
(Vloads_in_progress): Static.
Lute Kamstra <lute@gnu.org>
parents:
61418
diff
changeset
|
204 static Lisp_Object Vloads_in_progress; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
205 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
206 /* Non-zero means load dangerous compiled Lisp files. */ |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
207 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
208 int load_dangerous_libraries; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
209 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
210 /* Non-zero means force printing messages when loading Lisp files. */ |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
211 |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
212 int force_load_messages; |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
213 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
214 /* A regular expression used to detect files compiled with Emacs. */ |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
215 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
216 static Lisp_Object Vbytecomp_version_regexp; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
217 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
218 static int read_emacs_mule_char (int, int (*) (int, Lisp_Object), |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
219 Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
220 |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
221 static void readevalloop (Lisp_Object, FILE*, Lisp_Object, |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
222 Lisp_Object (*) (Lisp_Object), int, |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
223 Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
224 Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
225 static Lisp_Object load_unwind (Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
226 static Lisp_Object load_descriptor_unwind (Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
227 |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
228 static void invalid_syntax (const char *, int) NO_RETURN; |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
229 static void end_of_file_error (void) NO_RETURN; |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
230 |
341 | 231 |
88886 | 232 /* Functions that read one byte from the current source READCHARFUN |
233 or unreads one byte. If the integer argument C is -1, it returns | |
234 one read byte, or -1 when there's no more byte in the source. If C | |
235 is 0 or positive, it unreads C, and the return value is not | |
236 interesting. */ | |
237 | |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
238 static int readbyte_for_lambda (int, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
239 static int readbyte_from_file (int, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
240 static int readbyte_from_string (int, Lisp_Object); |
88886 | 241 |
341 | 242 /* Handle unreading and rereading of characters. |
243 Write READCHAR to read a character, | |
17038 | 244 UNREAD(c) to unread c to be read again. |
245 | |
88886 | 246 These macros correctly read/unread multibyte characters. */ |
341 | 247 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
248 #define READCHAR readchar (readcharfun, NULL) |
341 | 249 #define UNREAD(c) unreadchar (readcharfun, c) |
250 | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
251 /* Same as READCHAR but set *MULTIBYTE to the multibyteness of the source. */ |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
252 #define READCHAR_REPORT_MULTIBYTE(multibyte) readchar (readcharfun, multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
253 |
88886 | 254 /* When READCHARFUN is Qget_file_char, Qget_emacs_mule_file_char, |
89483 | 255 Qlambda, or a cons, we use this to keep an unread character because |
256 a file stream can't handle multibyte-char unreading. The value -1 | |
88886 | 257 means that there's no unread character. */ |
258 static int unread_char; | |
259 | |
341 | 260 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
261 readchar (Lisp_Object readcharfun, int *multibyte) |
341 | 262 { |
263 Lisp_Object tem; | |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
264 register int c; |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
265 int (*readbyte) (int, Lisp_Object); |
88886 | 266 unsigned char buf[MAX_MULTIBYTE_LENGTH]; |
267 int i, len; | |
268 int emacs_mule_encoding = 0; | |
341 | 269 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
270 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
271 *multibyte = 0; |
341 | 272 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
273 readchar_count++; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
274 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
275 if (BUFFERP (readcharfun)) |
341 | 276 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
277 register struct buffer *inbuffer = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
278 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
279 int pt_byte = BUF_PT_BYTE (inbuffer); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
280 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
281 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
|
282 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
283 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
284 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
285 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
286 /* 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
|
287 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
|
288 BUF_INC_POS (inbuffer, pt_byte); |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
106133
diff
changeset
|
289 c = STRING_CHAR (p); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
290 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
291 *multibyte = 1; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
292 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
293 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
294 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
295 c = BUF_FETCH_BYTE (inbuffer, pt_byte); |
88886 | 296 if (! ASCII_BYTE_P (c)) |
297 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
298 pt_byte++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
299 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
300 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
|
301 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
302 return c; |
341 | 303 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
304 if (MARKERP (readcharfun)) |
341 | 305 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
306 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
|
307 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
308 int bytepos = marker_byte_position (readcharfun); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
309 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
310 if (bytepos >= BUF_ZV_BYTE (inbuffer)) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
311 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
312 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
313 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
314 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
315 /* 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
|
316 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
|
317 BUF_INC_POS (inbuffer, bytepos); |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
106133
diff
changeset
|
318 c = STRING_CHAR (p); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
319 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
320 *multibyte = 1; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
321 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
322 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
323 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
324 c = BUF_FETCH_BYTE (inbuffer, bytepos); |
88886 | 325 if (! ASCII_BYTE_P (c)) |
326 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
327 bytepos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
328 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
329 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
330 XMARKER (readcharfun)->bytepos = bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
331 XMARKER (readcharfun)->charpos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
332 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
333 return c; |
341 | 334 } |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
335 |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
336 if (EQ (readcharfun, Qlambda)) |
88886 | 337 { |
338 readbyte = readbyte_for_lambda; | |
339 goto read_multibyte; | |
340 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
341 |
341 | 342 if (EQ (readcharfun, Qget_file_char)) |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
343 { |
88886 | 344 readbyte = readbyte_from_file; |
345 goto read_multibyte; | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
346 } |
341 | 347 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
348 if (STRINGP (readcharfun)) |
341 | 349 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
350 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
|
351 c = -1; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
352 else if (STRING_MULTIBYTE (readcharfun)) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
353 { |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
354 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
355 *multibyte = 1; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
356 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, readcharfun, |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
357 read_from_string_index, |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
358 read_from_string_index_byte); |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
359 } |
29014
4c02859dda27
(read1): On reading multibyte string, be sure to make
Kenichi Handa <handa@m17n.org>
parents:
28746
diff
changeset
|
360 else |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
361 { |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
362 c = SREF (readcharfun, read_from_string_index_byte); |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
363 read_from_string_index++; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
364 read_from_string_index_byte++; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
365 } |
341 | 366 return c; |
367 } | |
368 | |
88886 | 369 if (CONSP (readcharfun)) |
370 { | |
371 /* This is the case that read_vector is reading from a unibyte | |
372 string that contains a byte sequence previously skipped | |
373 because of #@NUMBER. The car part of readcharfun is that | |
374 string, and the cdr part is a value of readcharfun given to | |
375 read_vector. */ | |
376 readbyte = readbyte_from_string; | |
377 if (EQ (XCDR (readcharfun), Qget_emacs_mule_file_char)) | |
378 emacs_mule_encoding = 1; | |
379 goto read_multibyte; | |
380 } | |
89483 | 381 |
88886 | 382 if (EQ (readcharfun, Qget_emacs_mule_file_char)) |
383 { | |
384 readbyte = readbyte_from_file; | |
385 emacs_mule_encoding = 1; | |
386 goto read_multibyte; | |
387 } | |
341 | 388 |
389 tem = call0 (readcharfun); | |
390 | |
485 | 391 if (NILP (tem)) |
341 | 392 return -1; |
393 return XINT (tem); | |
88886 | 394 |
395 read_multibyte: | |
396 if (unread_char >= 0) | |
397 { | |
398 c = unread_char; | |
399 unread_char = -1; | |
400 return c; | |
401 } | |
402 c = (*readbyte) (-1, readcharfun); | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
403 if (c < 0 || load_each_byte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
404 return c; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
405 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
406 *multibyte = 1; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
407 if (ASCII_BYTE_P (c)) |
88886 | 408 return c; |
409 if (emacs_mule_encoding) | |
410 return read_emacs_mule_char (c, readbyte, readcharfun); | |
411 i = 0; | |
412 buf[i++] = c; | |
413 len = BYTES_BY_CHAR_HEAD (c); | |
414 while (i < len) | |
415 { | |
416 c = (*readbyte) (-1, readcharfun); | |
417 if (c < 0 || ! TRAILING_CODE_P (c)) | |
418 { | |
419 while (--i > 1) | |
420 (*readbyte) (buf[i], readcharfun); | |
421 return BYTE8_TO_CHAR (buf[0]); | |
422 } | |
423 buf[i++] = c; | |
424 } | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
106133
diff
changeset
|
425 return STRING_CHAR (buf); |
341 | 426 } |
427 | |
428 /* Unread the character C in the way appropriate for the stream READCHARFUN. | |
429 If the stream is a user function, call it with the char as argument. */ | |
430 | |
431 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
432 unreadchar (Lisp_Object readcharfun, int c) |
341 | 433 { |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
434 readchar_count--; |
6471
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
435 if (c == -1) |
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
436 /* 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
|
437 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
|
438 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
439 else if (BUFFERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
440 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
441 struct buffer *b = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
442 int bytepos = BUF_PT_BYTE (b); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
443 |
88886 | 444 BUF_PT (b)--; |
445 if (! NILP (b->enable_multibyte_characters)) | |
446 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
447 else |
88886 | 448 bytepos--; |
449 | |
450 BUF_PT_BYTE (b) = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
451 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
452 else if (MARKERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
453 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
454 struct buffer *b = XMARKER (readcharfun)->buffer; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
455 int bytepos = XMARKER (readcharfun)->bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
456 |
88886 | 457 XMARKER (readcharfun)->charpos--; |
458 if (! NILP (b->enable_multibyte_characters)) | |
459 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
460 else |
88886 | 461 bytepos--; |
462 | |
463 XMARKER (readcharfun)->bytepos = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
464 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
465 else if (STRINGP (readcharfun)) |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
466 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
467 read_from_string_index--; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
468 read_from_string_index_byte |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
469 = 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
|
470 } |
88886 | 471 else if (CONSP (readcharfun)) |
472 { | |
473 unread_char = c; | |
474 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
475 else if (EQ (readcharfun, Qlambda)) |
88886 | 476 { |
477 unread_char = c; | |
478 } | |
479 else if (EQ (readcharfun, Qget_file_char) | |
480 || EQ (readcharfun, Qget_emacs_mule_file_char)) | |
481 { | |
482 if (load_each_byte) | |
90789 | 483 { |
484 BLOCK_INPUT; | |
485 ungetc (c, instream); | |
486 UNBLOCK_INPUT; | |
487 } | |
88886 | 488 else |
489 unread_char = c; | |
490 } | |
341 | 491 else |
492 call1 (readcharfun, make_number (c)); | |
493 } | |
494 | |
88886 | 495 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
496 readbyte_for_lambda (int c, Lisp_Object readcharfun) |
88886 | 497 { |
498 return read_bytecode_char (c >= 0); | |
499 } | |
500 | |
501 | |
502 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
503 readbyte_from_file (int c, Lisp_Object readcharfun) |
88886 | 504 { |
505 if (c >= 0) | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
506 { |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
507 BLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
508 ungetc (c, instream); |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
509 UNBLOCK_INPUT; |
88886 | 510 return 0; |
511 } | |
512 | |
90789 | 513 BLOCK_INPUT; |
88886 | 514 c = getc (instream); |
90789 | 515 |
88886 | 516 #ifdef EINTR |
90789 | 517 /* Interrupted reads have been observed while reading over the network */ |
518 while (c == EOF && ferror (instream) && errno == EINTR) | |
519 { | |
90796 | 520 UNBLOCK_INPUT; |
90789 | 521 QUIT; |
522 BLOCK_INPUT; | |
90796 | 523 clearerr (instream); |
90789 | 524 c = getc (instream); |
525 } | |
88886 | 526 #endif |
90789 | 527 |
90796 | 528 UNBLOCK_INPUT; |
529 | |
88886 | 530 return (c == EOF ? -1 : c); |
531 } | |
532 | |
533 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
534 readbyte_from_string (int c, Lisp_Object readcharfun) |
88886 | 535 { |
536 Lisp_Object string = XCAR (readcharfun); | |
537 | |
538 if (c >= 0) | |
539 { | |
540 read_from_string_index--; | |
541 read_from_string_index_byte | |
542 = string_char_to_byte (string, read_from_string_index); | |
543 } | |
89483 | 544 |
88886 | 545 if (read_from_string_index >= read_from_string_limit) |
546 c = -1; | |
547 else | |
548 FETCH_STRING_CHAR_ADVANCE (c, string, | |
549 read_from_string_index, | |
550 read_from_string_index_byte); | |
551 return c; | |
552 } | |
553 | |
554 | |
555 /* Read one non-ASCII character from INSTREAM. The character is | |
556 encoded in `emacs-mule' and the first byte is already read in | |
557 C. */ | |
558 | |
559 extern char emacs_mule_bytes[256]; | |
560 | |
561 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
562 read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object readcharfun) |
88886 | 563 { |
564 /* Emacs-mule coding uses at most 4-byte for one character. */ | |
565 unsigned char buf[4]; | |
566 int len = emacs_mule_bytes[c]; | |
567 struct charset *charset; | |
568 int i; | |
569 unsigned code; | |
570 | |
571 if (len == 1) | |
572 /* C is not a valid leading-code of `emacs-mule'. */ | |
573 return BYTE8_TO_CHAR (c); | |
574 | |
575 i = 0; | |
576 buf[i++] = c; | |
577 while (i < len) | |
578 { | |
579 c = (*readbyte) (-1, readcharfun); | |
580 if (c < 0xA0) | |
581 { | |
582 while (--i > 1) | |
583 (*readbyte) (buf[i], readcharfun); | |
584 return BYTE8_TO_CHAR (buf[0]); | |
585 } | |
586 buf[i++] = c; | |
587 } | |
588 | |
589 if (len == 2) | |
590 { | |
89417 | 591 charset = emacs_mule_charset[buf[0]]; |
88886 | 592 code = buf[1] & 0x7F; |
593 } | |
594 else if (len == 3) | |
595 { | |
596 if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 | |
597 || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) | |
598 { | |
599 charset = emacs_mule_charset[buf[1]]; | |
600 code = buf[2] & 0x7F; | |
601 } | |
602 else | |
603 { | |
604 charset = emacs_mule_charset[buf[0]]; | |
605 code = ((buf[1] << 8) | buf[2]) & 0x7F7F; | |
606 } | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
607 } |
341 | 608 else |
88886 | 609 { |
610 charset = emacs_mule_charset[buf[1]]; | |
89483 | 611 code = ((buf[2] << 8) | buf[3]) & 0x7F7F; |
88886 | 612 } |
613 c = DECODE_CHAR (charset, code); | |
614 if (c < 0) | |
615 Fsignal (Qinvalid_read_syntax, | |
616 Fcons (build_string ("invalid multibyte form"), Qnil)); | |
617 return c; | |
341 | 618 } |
619 | |
88886 | 620 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
621 static Lisp_Object read_internal_start (Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
622 Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
623 static Lisp_Object read0 (Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
624 static Lisp_Object read1 (Lisp_Object, int *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
625 |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
626 static Lisp_Object read_list (int, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
627 static Lisp_Object read_vector (Lisp_Object, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
628 |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
629 static Lisp_Object substitute_object_recurse (Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
630 Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
631 static void substitute_object_in_subtree (Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
632 Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109010
diff
changeset
|
633 static void substitute_in_interval (INTERVAL, Lisp_Object); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
634 |
341 | 635 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
636 /* Get a character from the tty. */ |
341 | 637 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
638 /* 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
|
639 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
640 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
|
641 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
|
642 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
|
643 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
644 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
|
645 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
|
646 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
|
647 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
648 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
|
649 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
|
650 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
|
651 character. |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
652 |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
653 If INPUT_METHOD is nonzero, we invoke the current input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
654 if the character warrants that. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
655 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
656 If SECONDS is a number, we wait that many seconds for input, and |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
657 return Qnil if no input arrives within that time. */ |
14483
7f49c41db1e8
(Fread_char_exclusive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14300
diff
changeset
|
658 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
659 Lisp_Object |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109315
diff
changeset
|
660 read_filtered_event (int no_switch_frame, int ascii_required, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109315
diff
changeset
|
661 int error_nonascii, int input_method, Lisp_Object seconds) |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
662 { |
71672
9c4db0e8490f
(read_filtered_event): Remove `register' qualifier because it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71558
diff
changeset
|
663 Lisp_Object val, delayed_switch_frame; |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
664 EMACS_TIME end_time; |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
665 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
666 #ifdef HAVE_WINDOW_SYSTEM |
36256
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
667 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
668 cancel_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
669 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
670 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
671 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
|
672 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
673 /* Compute timeout. */ |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
674 if (NUMBERP (seconds)) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
675 { |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
676 EMACS_TIME wait_time; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
677 int sec, usec; |
74566
040d179fb669
(Feval_buffer, Feval_region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73800
diff
changeset
|
678 double duration = extract_float (seconds); |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
679 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
680 sec = (int) duration; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
681 usec = (duration - sec) * 1000000; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
682 EMACS_GET_TIME (end_time); |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
683 EMACS_SET_SECS_USECS (wait_time, sec, usec); |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
684 EMACS_ADD_TIME (end_time, end_time, wait_time); |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
685 } |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
686 |
83533 | 687 /* Read until we get an acceptable event. */ |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
688 retry: |
85000
2c723350c8ec
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84465
diff
changeset
|
689 do |
83533 | 690 val = read_char (0, 0, 0, (input_method ? Qnil : Qt), 0, |
691 NUMBERP (seconds) ? &end_time : NULL); | |
83460
dbd791ef90a1
Eliminate wrong_kboard_jmpbuf.
Karoly Lorentey <lorentey@elte.hu>
parents:
83450
diff
changeset
|
692 while (INTEGERP (val) && XINT (val) == -2); /* wrong_kboard_jmpbuf */ |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
693 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
694 if (BUFFERP (val)) |
5888
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
695 goto retry; |
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
696 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
697 /* switch-frame events are put off until after the next ASCII |
14036 | 698 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
|
699 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
|
700 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
|
701 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
|
702 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
|
703 && EVENT_HAS_PARAMETERS (val) |
71558
4252d6e24270
(read_filtered_event): Treat select-window just like switch-frame.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71484
diff
changeset
|
704 && EQ (EVENT_HEAD_KIND (EVENT_HEAD (val)), Qswitch_frame)) |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
705 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
706 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
|
707 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
708 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
709 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
710 if (ascii_required && !(NUMBERP (seconds) && NILP (val))) |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
711 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
712 /* 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
|
713 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
|
714 { |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
715 Lisp_Object tem, tem1; |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
716 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
|
717 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
|
718 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
719 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
|
720 /* 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
|
721 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
|
722 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
|
723 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
|
724 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
725 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
726 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
727 /* 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
|
728 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
|
729 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
730 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
|
731 { |
7106
06542cc6ddcd
(read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
732 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
|
733 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
|
734 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
735 else |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
736 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
737 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
738 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
739 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
740 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
|
741 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
|
742 |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
743 #if 0 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
744 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
745 #ifdef HAVE_WINDOW_SYSTEM |
36256
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
746 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
747 start_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
748 #endif |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
749 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
750 #endif |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
751 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
752 return val; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
753 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
754 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
755 DEFUN ("read-char", Fread_char, Sread_char, 0, 3, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
756 doc: /* Read a character from the command input (keyboard or macro). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
757 It is returned as a number. |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
758 If the character has modifiers, they are resolved and reflected to the |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
759 character code if possible (e.g. C-SPC -> 0). |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
760 |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
761 If the user generates an event which is not a character (i.e. a mouse |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
762 click or function key event), `read-char' signals an error. As an |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
763 exception, switch-frame events are put off until non-character events |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
764 can be read. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
765 If you want to read non-character events, or ignore them, call |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
766 `read-event' or `read-char-exclusive' instead. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
767 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
768 If the optional argument PROMPT is non-nil, display that as a prompt. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
769 If the optional argument INHERIT-INPUT-METHOD is non-nil and some |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
770 input method is turned on in the current buffer, that input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
771 is used for reading a character. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
772 If the optional argument SECONDS is non-nil, it should be a number |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
773 specifying the maximum number of seconds to wait for input. If no |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
774 input arrives in that time, return nil. SECONDS may be a |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
775 floating-point value. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
776 (Lisp_Object prompt, Lisp_Object inherit_input_method, Lisp_Object seconds) |
341 | 777 { |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
778 Lisp_Object val; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
779 |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
780 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
781 message_with_string ("%s", prompt, 0); |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
782 val = read_filtered_event (1, 1, 1, ! NILP (inherit_input_method), seconds); |
97470
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
783 |
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
784 return (NILP (val) ? Qnil |
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
785 : make_number (char_resolve_modifier_mask (XINT (val)))); |
341 | 786 } |
787 | |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
788 DEFUN ("read-event", Fread_event, Sread_event, 0, 3, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
789 doc: /* Read an event object from the input stream. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
790 If the optional argument PROMPT is non-nil, display that as a prompt. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
791 If the optional argument INHERIT-INPUT-METHOD is non-nil and some |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
792 input method is turned on in the current buffer, that input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
793 is used for reading a character. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
794 If the optional argument SECONDS is non-nil, it should be a number |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
795 specifying the maximum number of seconds to wait for input. If no |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
796 input arrives in that time, return nil. SECONDS may be a |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
797 floating-point value. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
798 (Lisp_Object prompt, Lisp_Object inherit_input_method, Lisp_Object seconds) |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
799 { |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
800 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
801 message_with_string ("%s", prompt, 0); |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
802 return read_filtered_event (0, 0, 0, ! NILP (inherit_input_method), seconds); |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
803 } |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
804 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
805 DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 3, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
806 doc: /* Read a character from the command input (keyboard or macro). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
807 It is returned as a number. Non-character events are ignored. |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
808 If the character has modifiers, they are resolved and reflected to the |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
809 character code if possible (e.g. C-SPC -> 0). |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
810 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
811 If the optional argument PROMPT is non-nil, display that as a prompt. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
812 If the optional argument INHERIT-INPUT-METHOD is non-nil and some |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
813 input method is turned on in the current buffer, that input method |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
814 is used for reading a character. |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
815 If the optional argument SECONDS is non-nil, it should be a number |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
816 specifying the maximum number of seconds to wait for input. If no |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
817 input arrives in that time, return nil. SECONDS may be a |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
818 floating-point value. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
819 (Lisp_Object prompt, Lisp_Object inherit_input_method, Lisp_Object seconds) |
341 | 820 { |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
821 Lisp_Object val; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
822 |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
823 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
824 message_with_string ("%s", prompt, 0); |
97470
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
825 |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
826 val = read_filtered_event (1, 1, 0, ! NILP (inherit_input_method), seconds); |
97470
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
827 |
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
828 return (NILP (val) ? Qnil |
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
829 : make_number (char_resolve_modifier_mask (XINT (val)))); |
341 | 830 } |
831 | |
832 DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
833 doc: /* Don't use this yourself. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
834 (void) |
341 | 835 { |
836 register Lisp_Object val; | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
837 BLOCK_INPUT; |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
838 XSETINT (val, getc (instream)); |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
839 UNBLOCK_INPUT; |
341 | 840 return val; |
841 } | |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
842 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
843 |
341 | 844 |
88886 | 845 /* Value is a version number of byte compiled code if the file |
91041 | 846 associated with file descriptor FD is a compiled Lisp file that's |
88886 | 847 safe to load. Only files compiled with Emacs are safe to load. |
848 Files compiled with XEmacs can lead to a crash in Fbyte_code | |
849 because of an incompatible change in the byte compiler. */ | |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
850 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
851 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
852 safe_to_load_p (int fd) |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
853 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
854 char buf[512]; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
855 int nbytes, i; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
856 int safe_p = 1; |
89483 | 857 int version = 1; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
858 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
859 /* Read the first few bytes from the file, and look for a line |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
860 specifying the byte compiler version used. */ |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
861 nbytes = emacs_read (fd, buf, sizeof buf - 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
862 if (nbytes > 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
863 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
864 buf[nbytes] = '\0'; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
865 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
866 /* Skip to the next newline, skipping over the initial `ELC' |
88774 | 867 with NUL bytes following it, but note the version. */ |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
868 for (i = 0; i < nbytes && buf[i] != '\n'; ++i) |
88774 | 869 if (i == 4) |
88886 | 870 version = buf[i]; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
871 |
89012
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
872 if (i == nbytes |
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
873 || fast_c_string_match_ignore_case (Vbytecomp_version_regexp, |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
874 buf + i) < 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
875 safe_p = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
876 } |
88774 | 877 if (safe_p) |
878 safe_p = version; | |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
879 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
880 lseek (fd, 0, SEEK_SET); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
881 return safe_p; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
882 } |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
883 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
884 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
885 /* Callback for record_unwind_protect. Restore the old load list OLD, |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
886 after loading a file successfully. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
887 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
888 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
889 record_load_unwind (Lisp_Object old) |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
890 { |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
891 return Vloads_in_progress = old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
892 } |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
893 |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
894 /* This handler function is used via internal_condition_case_1. */ |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
895 |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
896 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
897 load_error_handler (Lisp_Object data) |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
898 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
899 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
900 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
901 |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
902 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
903 load_warn_old_style_backquotes (Lisp_Object file) |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
904 { |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
905 if (!NILP (Vold_style_backquotes)) |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
906 { |
78628
29320ef98233
(load_warn_old_style_backquotes): Fix up array size typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78617
diff
changeset
|
907 Lisp_Object args[2]; |
84465
bf23b0b54ed3
(load_warn_old_style_backquotes): Change message to look
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83676
diff
changeset
|
908 args[0] = build_string ("Loading `%s': old-style backquotes detected!"); |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
909 args[1] = file; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
910 Fmessage (2, args); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
911 } |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
912 return Qnil; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
913 } |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
914 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
915 DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
916 doc: /* Return the suffixes that `load' should try if a suffix is \ |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
917 required. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
918 This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
919 (void) |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
920 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
921 Lisp_Object lst = Qnil, suffixes = Vload_suffixes, suffix, ext; |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
922 while (CONSP (suffixes)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
923 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
924 Lisp_Object exts = Vload_file_rep_suffixes; |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
925 suffix = XCAR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
926 suffixes = XCDR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
927 while (CONSP (exts)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
928 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
929 ext = XCAR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
930 exts = XCDR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
931 lst = Fcons (concat2 (suffix, ext), lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
932 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
933 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
934 return Fnreverse (lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
935 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
936 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
937 DEFUN ("load", Fload, Sload, 1, 5, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
938 doc: /* Execute a file of Lisp code named FILE. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
939 First try FILE with `.elc' appended, then try with `.el', |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
940 then try FILE unmodified (the exact suffixes in the exact order are |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
941 determined by `load-suffixes'). Environment variable references in |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
942 FILE are replaced with their values by calling `substitute-in-file-name'. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
943 This function searches the directories in `load-path'. |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
944 |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
945 If optional second arg NOERROR is non-nil, |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
946 report no error if FILE doesn't exist. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
947 Print messages at start and end of loading unless |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
948 optional third arg NOMESSAGE is non-nil (but `force-load-messages' |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
949 overrides that). |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
950 If optional fourth arg NOSUFFIX is non-nil, don't try adding |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
951 suffixes `.elc' or `.el' to the specified name FILE. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
952 If optional fifth arg MUST-SUFFIX is non-nil, insist on |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
953 the suffix `.elc' or `.el'; don't accept just FILE unless |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
954 it ends in one of those suffixes or includes a directory name. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
955 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
956 If this function fails to find a file, it may look for different |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
957 representations of that file before trying another file. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
958 It does so by adding the non-empty suffixes in `load-file-rep-suffixes' |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
959 to the file name. Emacs uses this feature mainly to find compressed |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
960 versions of files when Auto Compression mode is enabled. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
961 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
962 The exact suffixes that this function tries out, in the exact order, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
963 are given by the value of the variable `load-file-rep-suffixes' if |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
964 NOSUFFIX is non-nil and by the return value of the function |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
965 `get-load-suffixes' if MUST-SUFFIX is non-nil. If both NOSUFFIX and |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
966 MUST-SUFFIX are nil, this function first tries out the latter suffixes |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
967 and then the former. |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
968 |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
969 Loading a file records its definitions, and its `provide' and |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
970 `require' calls, in an element of `load-history' whose |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
971 car is the file name loaded. See `load-history'. |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
972 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
973 Return t if the file exists and loads successfully. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
974 (Lisp_Object file, Lisp_Object noerror, Lisp_Object nomessage, Lisp_Object nosuffix, Lisp_Object must_suffix) |
341 | 975 { |
976 register FILE *stream; | |
977 register int fd = -1; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
978 int count = SPECPDL_INDEX (); |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
979 struct gcpro gcpro1, gcpro2, gcpro3; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
980 Lisp_Object found, efound, hist_file_name; |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
981 /* 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
|
982 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
|
983 /* 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
|
984 int compiled = 0; |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
985 Lisp_Object handler; |
28370
b445e32d5a7a
(Fload): Move safe_p definition to above #ifdef DOS_NT block.
Jason Rumney <jasonr@gnu.org>
parents:
28367
diff
changeset
|
986 int safe_p = 1; |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109637
diff
changeset
|
987 const char *fmode = "r"; |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
988 Lisp_Object tmp[2]; |
88886 | 989 int version; |
990 | |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
991 #ifdef DOS_NT |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
992 fmode = "rt"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
993 #endif /* DOS_NT */ |
341 | 994 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
995 CHECK_STRING (file); |
341 | 996 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
997 /* If file name is magic, call the handler. */ |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
998 /* This shouldn't be necessary any more now that `openp' handles it right. |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
999 handler = Ffind_file_name_handler (file, Qload); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1000 if (!NILP (handler)) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1001 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
|
1002 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
1003 /* 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
|
1004 the need to gcpro noerror, nomessage and nosuffix. |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1005 (Below here, we care only whether they are nil or not.) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1006 The presence of this call is the result of a historical accident: |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1007 it used to be in every file-operation and when it got removed |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1008 everywhere, it accidentally stayed here. Since then, enough people |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1009 supposedly have things like (load "$PROJECT/foo.el") in their .emacs |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1010 that it seemed risky to remove. */ |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1011 if (! NILP (noerror)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1012 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1013 file = internal_condition_case_1 (Fsubstitute_in_file_name, file, |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1014 Qt, load_error_handler); |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1015 if (NILP (file)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1016 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1017 } |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1018 else |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1019 file = Fsubstitute_in_file_name (file); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
1020 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
1021 |
341 | 1022 /* Avoid weird lossage with null string as arg, |
1023 since it would try to load a directory as a Lisp file */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1024 if (SCHARS (file) > 0) |
341 | 1025 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1026 int size = SBYTES (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
|
1027 |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1028 found = Qnil; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1029 GCPRO2 (file, found); |
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
|
1030 |
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
|
1031 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
|
1032 { |
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
|
1033 /* 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
|
1034 if (size > 3 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1035 && !strcmp (SDATA (file) + size - 3, ".el")) |
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
|
1036 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
|
1037 else if (size > 4 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1038 && !strcmp (SDATA (file) + size - 4, ".elc")) |
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
|
1039 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
|
1040 /* 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
|
1041 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
|
1042 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
|
1043 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
|
1044 } |
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
|
1045 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
1046 fd = openp (Vload_path, file, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1047 (!NILP (nosuffix) ? Qnil |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1048 : !NILP (must_suffix) ? Fget_load_suffixes () |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1049 : Fappend (2, (tmp[0] = Fget_load_suffixes (), |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1050 tmp[1] = Vload_file_rep_suffixes, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1051 tmp))), |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1052 &found, Qnil); |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1053 UNGCPRO; |
341 | 1054 } |
1055 | |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1056 if (fd == -1) |
341 | 1057 { |
485 | 1058 if (NILP (noerror)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1059 xsignal2 (Qfile_error, build_string ("Cannot open load file"), file); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1060 return Qnil; |
341 | 1061 } |
1062 | |
29122
47f68a566622
(Fload): Add a comment about the meaning of
Gerd Moellmann <gerd@gnu.org>
parents:
29014
diff
changeset
|
1063 /* Tell startup.el whether or not we found the user's init file. */ |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1064 if (EQ (Qt, Vuser_init_file)) |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1065 Vuser_init_file = found; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1066 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1067 /* If FD is -2, that means openp found a magic file. */ |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1068 if (fd == -2) |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1069 { |
23193
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1070 if (NILP (Fequal (found, file))) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1071 /* 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
|
1072 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
|
1073 the `load' operation on FILE. */ |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1074 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
|
1075 else |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1076 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
|
1077 if (! NILP (handler)) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1078 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
|
1079 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1080 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1081 /* Check if we're stuck in a recursive load cycle. |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1082 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1083 2000-09-21: It's not possible to just check for the file loaded |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1084 being a member of Vloads_in_progress. This fails because of the |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1085 way the byte compiler currently works; `provide's are not |
98090
d8b291454853
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
97470
diff
changeset
|
1086 evaluated, see font-lock.el/jit-lock.el as an example. This |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1087 leads to a certain amount of ``normal'' recursion. |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1088 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1089 Also, just loading a file recursively is not always an error in |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1090 the general case; the second load may do something different. */ |
41463
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1091 { |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1092 int count = 0; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1093 Lisp_Object tem; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1094 for (tem = Vloads_in_progress; CONSP (tem); tem = XCDR (tem)) |
102267
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1095 if (!NILP (Fequal (found, XCAR (tem))) && (++count > 3)) |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1096 { |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1097 if (fd >= 0) |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1098 emacs_close (fd); |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1099 signal_error ("Recursive load", Fcons (found, Vloads_in_progress)); |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1100 } |
41463
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1101 record_unwind_protect (record_load_unwind, Vloads_in_progress); |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1102 Vloads_in_progress = Fcons (found, Vloads_in_progress); |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1103 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1104 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1105 /* Get the name for load-history. */ |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1106 hist_file_name = (! NILP (Vpurify_flag) |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1107 ? Fconcat (2, (tmp[0] = Ffile_name_directory (file), |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1108 tmp[1] = Ffile_name_nondirectory (found), |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1109 tmp)) |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1110 : found) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1111 |
88886 | 1112 version = -1; |
91015 | 1113 |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
1114 /* Check for the presence of old-style quotes and warn about them. */ |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
1115 specbind (Qold_style_backquotes, Qnil); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
1116 record_unwind_protect (load_warn_old_style_backquotes, file); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
1117 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1118 if (!memcmp (SDATA (found) + SBYTES (found) - 4, ".elc", 4) |
106949
86ae2a69cf52
Fix bug #5303 in `load' on MS-Windows, whereby load-file would fail
Eli Zaretskii <eliz@gnu.org>
parents:
106815
diff
changeset
|
1119 || (fd >= 0 && (version = safe_to_load_p (fd)) > 0)) |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1120 /* Load .elc files directly, but not when they are |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1121 remote and have no handler! */ |
341 | 1122 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1123 if (fd != -2) |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1124 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1125 struct stat s1, s2; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1126 int result; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1127 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1128 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1129 |
88886 | 1130 if (version < 0 |
1131 && ! (version = safe_to_load_p (fd))) | |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1132 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1133 safe_p = 0; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1134 if (!load_dangerous_libraries) |
48087
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1135 { |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1136 if (fd >= 0) |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1137 emacs_close (fd); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1138 error ("File `%s' was not compiled in Emacs", |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1139 SDATA (found)); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1140 } |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1141 else if (!NILP (nomessage) && !force_load_messages) |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1142 message_with_string ("File `%s' not compiled in Emacs", found, 1); |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1143 } |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1144 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1145 compiled = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1146 |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1147 efound = ENCODE_FILE (found); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1148 |
33570 | 1149 #ifdef DOS_NT |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1150 fmode = "rb"; |
33570 | 1151 #endif /* DOS_NT */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1152 stat ((char *)SDATA (efound), &s1); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1153 SSET (efound, SBYTES (efound) - 1, 0); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1154 result = stat ((char *)SDATA (efound), &s2); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1155 SSET (efound, SBYTES (efound) - 1, 'c'); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1156 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1157 if (result >= 0 && (unsigned) s1.st_mtime < (unsigned) s2.st_mtime) |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1158 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1159 /* Make the progress messages mention that source is newer. */ |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1160 newer = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1161 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1162 /* If we won't print another message, mention this anyway. */ |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1163 if (!NILP (nomessage) && !force_load_messages) |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1164 { |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1165 Lisp_Object msg_file; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1166 msg_file = Fsubstring (found, make_number (0), make_number (-1)); |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1167 message_with_string ("Source file `%s' newer than byte-compiled file", |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1168 msg_file, 1); |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1169 } |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1170 } |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1171 UNGCPRO; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1172 } |
341 | 1173 } |
17038 | 1174 else |
1175 { | |
1176 /* We are loading a source file (*.el). */ | |
1177 if (!NILP (Vload_source_file_function)) | |
1178 { | |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1179 Lisp_Object val; |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1180 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1181 if (fd >= 0) |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1182 emacs_close (fd); |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1183 val = call4 (Vload_source_file_function, found, hist_file_name, |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1184 NILP (noerror) ? Qnil : Qt, |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1185 (NILP (nomessage) || force_load_messages) ? Qnil : Qt); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1186 return unbind_to (count, val); |
17038 | 1187 } |
1188 } | |
341 | 1189 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1190 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1191 |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1192 #ifdef WINDOWSNT |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1193 emacs_close (fd); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1194 efound = ENCODE_FILE (found); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1195 stream = fopen ((char *) SDATA (efound), fmode); |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1196 #else /* not WINDOWSNT */ |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1197 stream = fdopen (fd, fmode); |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1198 #endif /* not WINDOWSNT */ |
341 | 1199 if (stream == 0) |
1200 { | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1201 emacs_close (fd); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1202 error ("Failure to create stdio stream for %s", SDATA (file)); |
341 | 1203 } |
1204 | |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1205 if (! NILP (Vpurify_flag)) |
105798
0ad1fc06bfc8
* puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105028
diff
changeset
|
1206 Vpreloaded_file_list = Fcons (Fpurecopy(file), Vpreloaded_file_list); |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1207 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1208 if (NILP (nomessage) || force_load_messages) |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
1209 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1210 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1211 message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...", |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1212 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1213 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1214 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
|
1215 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1216 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
|
1217 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1218 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
|
1219 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
|
1220 } |
341 | 1221 |
64533
dc17db575e11
(Fload, load_unwind): Use make_save_value to unwind
Kim F. Storm <storm@cua.dk>
parents:
64317
diff
changeset
|
1222 record_unwind_protect (load_unwind, make_save_value (stream, 0)); |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1223 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
|
1224 specbind (Qload_file_name, found); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1225 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
|
1226 load_descriptor_list |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1227 = Fcons (make_number (fileno (stream)), load_descriptor_list); |
104059
3750eeb20ab9
* lread.c: Rewrite 2009-07-21 changes.
Ken Raeburn <raeburn@raeburn.org>
parents:
104006
diff
changeset
|
1228 specbind (Qload_in_progress, Qt); |
88888
1b6e73e289bc
(Fload): Don't load with Qload_force_doc_strings t if
Kenichi Handa <handa@m17n.org>
parents:
88886
diff
changeset
|
1229 if (! version || version >= 22) |
90428 | 1230 readevalloop (Qget_file_char, stream, hist_file_name, |
90260
0ca0d9181b5e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95
Miles Bader <miles@gnu.org>
diff
changeset
|
1231 Feval, 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1232 else |
1233 { | |
1234 /* We can't handle a file which was compiled with | |
1235 byte-compile-dynamic by older version of Emacs. */ | |
1236 specbind (Qload_force_doc_strings, Qt); | |
90428 | 1237 readevalloop (Qget_emacs_mule_file_char, stream, hist_file_name, Feval, |
90140
02f1dbc4a199
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Miles Bader <miles@gnu.org>
diff
changeset
|
1238 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1239 } |
341 | 1240 unbind_to (count, Qnil); |
1241 | |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1242 /* Run any eval-after-load forms for this file */ |
105028
77cce41847d5
(Fload): Also run do-after-load-evaluation while dumping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104977
diff
changeset
|
1243 if (!NILP (Ffboundp (Qdo_after_load_evaluation))) |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1244 call1 (Qdo_after_load_evaluation, hist_file_name) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1245 |
341 | 1246 UNGCPRO; |
1247 | |
95860
353a9f7910cf
* lread.c (Fload): Use xfree, not free on saved_doc_string.
Jim Meyering <jim@meyering.net>
parents:
95481
diff
changeset
|
1248 xfree (saved_doc_string); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1249 saved_doc_string = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1250 saved_doc_string_size = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1251 |
95481
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95479
diff
changeset
|
1252 xfree (prev_saved_doc_string); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1253 prev_saved_doc_string = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1254 prev_saved_doc_string_size = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1255 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1256 if (!noninteractive && (NILP (nomessage) || force_load_messages)) |
16012
3b5ffd35defe
(Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents:
15283
diff
changeset
|
1257 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1258 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1259 message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...done", |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1260 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1261 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1262 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
|
1263 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1264 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
|
1265 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1266 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
|
1267 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
|
1268 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1269 |
341 | 1270 return Qt; |
1271 } | |
1272 | |
1273 static Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1274 load_unwind (Lisp_Object arg) /* used as unwind-protect function in load */ |
341 | 1275 { |
64536
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1276 FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; |
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1277 if (stream != NULL) |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1278 { |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1279 BLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1280 fclose (stream); |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1281 UNBLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1282 } |
341 | 1283 return Qnil; |
1284 } | |
1285 | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1286 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1287 load_descriptor_unwind (Lisp_Object oldlist) |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1288 { |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1289 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
|
1290 return Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1291 } |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1292 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1293 /* 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
|
1294 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
|
1295 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1296 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1297 close_load_descs (void) |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1298 { |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1299 #ifndef WINDOWSNT |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1300 Lisp_Object tail; |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85127
diff
changeset
|
1301 for (tail = load_descriptor_list; CONSP (tail); tail = XCDR (tail)) |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1302 emacs_close (XFASTINT (XCAR (tail))); |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1303 #endif |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1304 } |
341 | 1305 |
1306 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1307 complete_filename_p (Lisp_Object pathname) |
341 | 1308 { |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1309 register const unsigned char *s = SDATA (pathname); |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
1310 return (IS_DIRECTORY_SEP (s[0]) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1311 || (SCHARS (pathname) > 2 |
97142 | 1312 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))); |
341 | 1313 } |
1314 | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1315 DEFUN ("locate-file-internal", Flocate_file_internal, Slocate_file_internal, 2, 4, 0, |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1316 doc: /* Search for FILENAME through PATH. |
62116
f1b7fe92d96a
(Flocate_file_internal): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
61623
diff
changeset
|
1317 Returns the file's name in absolute form, or nil if not found. |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1318 If SUFFIXES is non-nil, it should be a list of suffixes to append to |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1319 file name when searching. |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1320 If non-nil, PREDICATE is used instead of `file-readable-p'. |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1321 PREDICATE can also be an integer to pass to the access(2) function, |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1322 in which case file-name-handlers are ignored. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1323 (Lisp_Object filename, Lisp_Object path, Lisp_Object suffixes, Lisp_Object predicate) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1324 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1325 Lisp_Object file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1326 int fd = openp (path, filename, suffixes, &file, predicate); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1327 if (NILP (predicate) && fd > 0) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1328 close (fd); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1329 return file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1330 } |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1331 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1332 |
341 | 1333 /* Search for a file whose name is STR, looking in directories |
1334 in the Lisp list PATH, and trying suffixes from SUFFIX. | |
1335 On success, returns a file descriptor. On failure, returns -1. | |
1336 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1337 SUFFIXES is a list of strings containing possible suffixes. |
78501 | 1338 The empty suffix is automatically added if the list is empty. |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1339 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1340 PREDICATE non-nil means don't open the files, |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1341 just look for one that satisfies the predicate. In this case, |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1342 returns 1 on success. The predicate can be a lisp function or |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1343 an integer to pass to `access' (in which case file-name-handlers |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1344 are ignored). |
341 | 1345 |
1346 If STOREPTR is nonzero, it points to a slot where the name of | |
1347 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
|
1348 nil is stored there on failure. |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1349 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1350 If the file we find is remote, return -2 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1351 but store the found remote file name in *STOREPTR. */ |
341 | 1352 |
1353 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1354 openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *storeptr, Lisp_Object predicate) |
341 | 1355 { |
1356 register int fd; | |
1357 int fn_size = 100; | |
1358 char buf[100]; | |
1359 register char *fn = buf; | |
1360 int absolute = 0; | |
1361 int want_size; | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1362 Lisp_Object filename; |
341 | 1363 struct stat st; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1364 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1365 Lisp_Object string, tail, encoded_fn; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1366 int max_suffix_len = 0; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1367 |
51380
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1368 CHECK_STRING (str); |
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1369 |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1370 for (tail = suffixes; CONSP (tail); tail = XCDR (tail)) |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1371 { |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
1372 CHECK_STRING_CAR (tail); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1373 max_suffix_len = max (max_suffix_len, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1374 SBYTES (XCAR (tail))); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1375 } |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1376 |
68649
70566c3d72b1
(openp): Initialized encoded_fn before GCPRO it.
Kenichi Handa <handa@m17n.org>
parents:
68301
diff
changeset
|
1377 string = filename = encoded_fn = Qnil; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1378 GCPRO6 (str, string, filename, path, suffixes, encoded_fn); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1379 |
341 | 1380 if (storeptr) |
1381 *storeptr = Qnil; | |
1382 | |
1383 if (complete_filename_p (str)) | |
1384 absolute = 1; | |
1385 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1386 for (; CONSP (path); path = XCDR (path)) |
341 | 1387 { |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1388 filename = Fexpand_file_name (str, XCAR (path)); |
341 | 1389 if (!complete_filename_p (filename)) |
1390 /* If there are non-absolute elts in PATH (eg ".") */ | |
1391 /* Of course, this could conceivably lose if luser sets | |
1392 default-directory to be something non-absolute... */ | |
1393 { | |
1394 filename = Fexpand_file_name (filename, current_buffer->directory); | |
1395 if (!complete_filename_p (filename)) | |
1396 /* Give up on this path element! */ | |
1397 continue; | |
1398 } | |
1399 | |
1400 /* Calculate maximum size of any filename made from | |
1401 this path element/specified file name and any possible suffix. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1402 want_size = max_suffix_len + SBYTES (filename) + 1; |
341 | 1403 if (fn_size < want_size) |
1404 fn = (char *) alloca (fn_size = 100 + want_size); | |
1405 | |
1406 /* Loop over suffixes. */ | |
81270
0bf4e298d593
(syms_of_lread, openp): Use empty_unibyte_string, not build_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
80808
diff
changeset
|
1407 for (tail = NILP (suffixes) ? Fcons (empty_unibyte_string, Qnil) : suffixes; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1408 CONSP (tail); tail = XCDR (tail)) |
341 | 1409 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1410 int lsuffix = SBYTES (XCAR (tail)); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1411 Lisp_Object handler; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1412 int exists; |
341 | 1413 |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1414 /* 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
|
1415 If the directory starts with /:, remove that. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1416 if (SCHARS (filename) > 2 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1417 && SREF (filename, 0) == '/' |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1418 && SREF (filename, 1) == ':') |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1419 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1420 strncpy (fn, SDATA (filename) + 2, |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1421 SBYTES (filename) - 2); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1422 fn[SBYTES (filename) - 2] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1423 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1424 else |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1425 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1426 strncpy (fn, SDATA (filename), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1427 SBYTES (filename)); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1428 fn[SBYTES (filename)] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1429 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1430 |
341 | 1431 if (lsuffix != 0) /* Bug happens on CCI if lsuffix is 0. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1432 strncat (fn, SDATA (XCAR (tail)), lsuffix); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1433 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1434 /* Check that the file exists and is not a directory. */ |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1435 /* We used to only check for handlers on non-absolute file names: |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1436 if (absolute) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1437 handler = Qnil; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1438 else |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1439 handler = Ffind_file_name_handler (filename, Qfile_exists_p); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1440 It's not clear why that was the case and it breaks things like |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1441 (load "/bar.el") where the file is actually "/bar.el.gz". */ |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1442 string = build_string (fn); |
50492
3a74e250f1a1
(openp): Get the Qfile_exists_p handler for STRING, not FN.
Richard M. Stallman <rms@gnu.org>
parents:
50138
diff
changeset
|
1443 handler = Ffind_file_name_handler (string, Qfile_exists_p); |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1444 if ((!NILP (handler) || !NILP (predicate)) && !NATNUMP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1445 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1446 if (NILP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1447 exists = !NILP (Ffile_readable_p (string)); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1448 else |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1449 exists = !NILP (call1 (predicate, string)); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1450 if (exists && !NILP (Ffile_directory_p (string))) |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1451 exists = 0; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1452 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1453 if (exists) |
341 | 1454 { |
1455 /* We succeeded; return this descriptor and filename. */ | |
1456 if (storeptr) | |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1457 *storeptr = string; |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1458 UNGCPRO; |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1459 return -2; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1460 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1461 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1462 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1463 { |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1464 const char *pfn; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1465 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1466 encoded_fn = ENCODE_FILE (string); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1467 pfn = SDATA (encoded_fn); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1468 exists = (stat (pfn, &st) >= 0 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1469 && (st.st_mode & S_IFMT) != S_IFDIR); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1470 if (exists) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1471 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1472 /* Check that we can access or open it. */ |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1473 if (NATNUMP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1474 fd = (access (pfn, XFASTINT (predicate)) == 0) ? 1 : -1; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1475 else |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1476 fd = emacs_open (pfn, O_RDONLY, 0); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1477 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1478 if (fd >= 0) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1479 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1480 /* 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
|
1481 if (storeptr) |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1482 *storeptr = string; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1483 UNGCPRO; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1484 return fd; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1485 } |
341 | 1486 } |
1487 } | |
1488 } | |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1489 if (absolute) |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1490 break; |
341 | 1491 } |
1492 | |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1493 UNGCPRO; |
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1494 return -1; |
341 | 1495 } |
1496 | |
1497 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1498 /* 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
|
1499 into the load_history variable. The details depend on whether |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1500 the source has an associated file name or not. |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1501 |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1502 FILENAME is the file name that we are loading from. |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1503 ENTIRE is 1 if loading that entire file, 0 if evaluating part of it. */ |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1504 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1505 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1506 build_load_history (Lisp_Object filename, int entire) |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1507 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1508 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
|
1509 register Lisp_Object tem, tem2; |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1510 register int foundit = 0; |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1511 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1512 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
|
1513 prev = Qnil; |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1514 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1515 while (CONSP (tail)) |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1516 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1517 tem = XCAR (tail); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1518 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1519 /* Find the feature's previous assoc list... */ |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1520 if (!NILP (Fequal (filename, Fcar (tem)))) |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1521 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1522 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
|
1523 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1524 /* If we're loading the entire file, remove old data. */ |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1525 if (entire) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1526 { |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1527 if (NILP (prev)) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1528 Vload_history = XCDR (tail); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1529 else |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1530 Fsetcdr (prev, XCDR (tail)); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1531 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1532 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1533 /* 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
|
1534 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1535 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1536 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
|
1537 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1538 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
|
1539 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1540 newelt = XCAR (tem2); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1541 |
47021
3bd4234e0844
(build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents:
46472
diff
changeset
|
1542 if (NILP (Fmember (newelt, tem))) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1543 Fsetcar (tail, Fcons (XCAR (tem), |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1544 Fcons (newelt, XCDR (tem)))); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1545 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1546 tem2 = XCDR (tem2); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1547 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1548 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1549 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1550 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1551 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1552 prev = tail; |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1553 tail = XCDR (tail); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1554 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1555 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1556 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1557 /* If we're loading an entire file, cons the new assoc onto the |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1558 front of load-history, the most-recently-loaded position. Also |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1559 do this if we didn't find an existing member for the file. */ |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1560 if (entire || !foundit) |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
1561 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
|
1562 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
|
1563 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1564 |
109542
6b02202d9fdc
* lread.c (unreadpure, mapatoms_1): Make static.
Juanma Barranquero <lekktu@gmail.com>
parents:
109364
diff
changeset
|
1565 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1566 unreadpure (Lisp_Object junk) /* Used as unwind-protect function in readevalloop */ |
341 | 1567 { |
1568 read_pure = 0; | |
1569 return Qnil; | |
1570 } | |
1571 | |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1572 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1573 readevalloop_1 (Lisp_Object old) |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1574 { |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1575 load_convert_to_unibyte = ! NILP (old); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1576 return Qnil; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1577 } |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1578 |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1579 /* Signal an `end-of-file' error, if possible with file name |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1580 information. */ |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1581 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1582 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1583 end_of_file_error (void) |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1584 { |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1585 if (STRINGP (Vload_file_name)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1586 xsignal1 (Qend_of_file, Vload_file_name); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1587 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1588 xsignal0 (Qend_of_file); |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1589 } |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1590 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1591 /* 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
|
1592 for this invocation. |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1593 READFUN, if non-nil, is used instead of `read'. |
70595
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1594 |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1595 START, END specify region to read in current buffer (from eval-region). |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1596 If the input is not from a buffer, they must be nil. */ |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1597 |
341 | 1598 static void |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
1599 readevalloop (Lisp_Object readcharfun, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
1600 FILE *stream, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
1601 Lisp_Object sourcename, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
1602 Lisp_Object (*evalfun) (Lisp_Object), |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
1603 int printflag, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
1604 Lisp_Object unibyte, Lisp_Object readfun, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109137
diff
changeset
|
1605 Lisp_Object start, Lisp_Object end) |
341 | 1606 { |
1607 register int c; | |
1608 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1609 int count = SPECPDL_INDEX (); |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1610 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1611 struct buffer *b = 0; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1612 int continue_reading_p; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1613 /* Nonzero if reading an entire buffer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1614 int whole_buffer = 0; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1615 /* 1 on the first time around. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1616 int first_sexp = 1; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1617 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1618 if (MARKERP (readcharfun)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1619 { |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1620 if (NILP (start)) |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1621 start = readcharfun; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1622 } |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1623 |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1624 if (BUFFERP (readcharfun)) |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1625 b = XBUFFER (readcharfun); |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1626 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
|
1627 b = XMARKER (readcharfun)->buffer; |
341 | 1628 |
70595
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1629 /* We assume START is nil when input is not from a buffer. */ |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1630 if (! NILP (start) && !b) |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1631 abort (); |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1632 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1633 specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun. */ |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
1634 specbind (Qcurrent_load_list, Qnil); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1635 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
|
1636 load_convert_to_unibyte = !NILP (unibyte); |
341 | 1637 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1638 GCPRO4 (sourcename, readfun, start, end); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1639 |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1640 /* Try to ensure sourcename is a truename, except whilst preloading. */ |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1641 if (NILP (Vpurify_flag) |
71673
1404a22bd1f5
(readevalloop): Remove unused var `bpos'. Yet another int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71672
diff
changeset
|
1642 && !NILP (sourcename) && !NILP (Ffile_name_absolute_p (sourcename)) |
1404a22bd1f5
(readevalloop): Remove unused var `bpos'. Yet another int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71672
diff
changeset
|
1643 && !NILP (Ffboundp (Qfile_truename))) |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1644 sourcename = call1 (Qfile_truename, sourcename) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
1645 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1646 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
|
1647 |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1648 continue_reading_p = 1; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1649 while (continue_reading_p) |
341 | 1650 { |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1651 int count1 = SPECPDL_INDEX (); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1652 |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1653 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
|
1654 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
|
1655 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1656 if (!NILP (start)) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1657 { |
67871
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1658 /* Switch to the buffer we are reading from. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1659 record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
67871
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1660 set_buffer_internal (b); |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1661 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1662 /* Save point in it. */ |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1663 record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1664 /* Save ZV in it. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1665 record_unwind_protect (save_restriction_restore, save_restriction_save ()); |
67871
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1666 /* Those get unbound after we read one expression. */ |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1667 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1668 /* Set point and ZV around stuff to be read. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1669 Fgoto_char (start); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1670 if (!NILP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1671 Fnarrow_to_region (make_number (BEGV), end); |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1672 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1673 /* Just for cleanliness, convert END to a marker |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1674 if it is an integer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1675 if (INTEGERP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1676 end = Fpoint_max_marker (); |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1677 } |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1678 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1679 /* On the first cycle, we can easily test here |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1680 whether we are reading the whole buffer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1681 if (b && first_sexp) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1682 whole_buffer = (PT == BEG && ZV == Z); |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1683 |
341 | 1684 instream = stream; |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1685 read_next: |
341 | 1686 c = READCHAR; |
1687 if (c == ';') | |
1688 { | |
1689 while ((c = READCHAR) != '\n' && c != -1); | |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1690 goto read_next; |
341 | 1691 } |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1692 if (c < 0) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1693 { |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1694 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1695 break; |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1696 } |
10163
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1697 |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1698 /* Ignore whitespace here, so we can detect eof. */ |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1699 if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' |
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1700 || c == 0x8a0) /* NBSP */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1701 goto read_next; |
341 | 1702 |
485 | 1703 if (!NILP (Vpurify_flag) && c == '(') |
341 | 1704 { |
1705 record_unwind_protect (unreadpure, Qnil); | |
1706 val = read_list (-1, readcharfun); | |
1707 } | |
1708 else | |
1709 { | |
1710 UNREAD (c); | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1711 read_objects = Qnil; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1712 if (!NILP (readfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1713 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1714 val = call1 (readfun, readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1715 |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1716 /* If READCHARFUN has set point to ZV, we should |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1717 stop reading, even if the form read sets point |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1718 to a different value when evaluated. */ |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1719 if (BUFFERP (readcharfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1720 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1721 struct buffer *b = XBUFFER (readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1722 if (BUF_PT (b) == BUF_ZV (b)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1723 continue_reading_p = 0; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1724 } |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1725 } |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1726 else if (! NILP (Vload_read_function)) |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1727 val = call1 (Vload_read_function, readcharfun); |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1728 else |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1729 val = read_internal_start (readcharfun, Qnil, Qnil); |
341 | 1730 } |
1731 | |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1732 if (!NILP (start) && continue_reading_p) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1733 start = Fpoint_marker (); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1734 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1735 /* Restore saved point and BEGV. */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1736 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1737 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1738 /* Now eval what we just read. */ |
341 | 1739 val = (*evalfun) (val); |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1740 |
341 | 1741 if (printflag) |
1742 { | |
1743 Vvalues = Fcons (val, Vvalues); | |
1744 if (EQ (Vstandard_output, Qt)) | |
1745 Fprin1 (val, Qnil); | |
1746 else | |
1747 Fprint (val, Qnil); | |
1748 } | |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1749 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1750 first_sexp = 0; |
341 | 1751 } |
1752 | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1753 build_load_history (sourcename, |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1754 stream || whole_buffer); |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1755 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1756 UNGCPRO; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1757 |
341 | 1758 unbind_to (count, Qnil); |
1759 } | |
1760 | |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1761 DEFUN ("eval-buffer", Feval_buffer, Seval_buffer, 0, 5, "", |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1762 doc: /* Execute the current buffer as Lisp code. |
102465
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1763 When called from a Lisp program (i.e., not interactively), this |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1764 function accepts up to five optional arguments: |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1765 BUFFER is the buffer to evaluate (nil means use current buffer). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1766 PRINTFLAG controls printing of output: |
102465
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1767 A value of nil means discard it; anything else is stream for print. |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1768 FILENAME specifies the file name to use for `load-history'. |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1769 UNIBYTE, if non-nil, specifies `load-convert-to-unibyte' for this |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1770 invocation. |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1771 DO-ALLOW-PRINT, if non-nil, specifies that `print' and related |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1772 functions should work normally even if PRINTFLAG is nil. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1773 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1774 This function preserves the position of point. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1775 (Lisp_Object buffer, Lisp_Object printflag, Lisp_Object filename, Lisp_Object unibyte, Lisp_Object do_allow_print) |
672 | 1776 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1777 int count = SPECPDL_INDEX (); |
672 | 1778 Lisp_Object tem, buf; |
1779 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1780 if (NILP (buffer)) |
672 | 1781 buf = Fcurrent_buffer (); |
1782 else | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1783 buf = Fget_buffer (buffer); |
673 | 1784 if (NILP (buf)) |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1785 error ("No such buffer"); |
672 | 1786 |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1787 if (NILP (printflag) && NILP (do_allow_print)) |
672 | 1788 tem = Qsymbolp; |
1789 else | |
1790 tem = printflag; | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1791 |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1792 if (NILP (filename)) |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1793 filename = XBUFFER (buf)->filename; |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1794 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1795 specbind (Qeval_buffer_list, Fcons (buf, Veval_buffer_list)); |
672 | 1796 specbind (Qstandard_output, tem); |
1797 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
93110
6d11337f1ad8
* fileio.c (Finsert_file_contents):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92497
diff
changeset
|
1798 BUF_TEMP_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf))); |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1799 readevalloop (buf, 0, filename, Feval, |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1800 !NILP (printflag), unibyte, Qnil, Qnil, Qnil); |
1924
21bd3a2189d3
* keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents:
1887
diff
changeset
|
1801 unbind_to (count, Qnil); |
672 | 1802 |
1803 return Qnil; | |
1804 } | |
1805 | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1806 DEFUN ("eval-region", Feval_region, Seval_region, 2, 4, "r", |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1807 doc: /* Execute the region as Lisp code. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1808 When called from programs, expects two arguments, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1809 giving starting and ending indices in the current buffer |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1810 of the text to be executed. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1811 Programs can pass third argument PRINTFLAG which controls output: |
74566
040d179fb669
(Feval_buffer, Feval_region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73800
diff
changeset
|
1812 A value of nil means discard it; anything else is stream for printing it. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1813 Also the fourth argument READ-FUNCTION, if non-nil, is used |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1814 instead of `read' to read each expression. It gets one argument |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1815 which is the input stream for reading characters. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1816 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1817 This function does not move point. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1818 (Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function) |
341 | 1819 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1820 int count = SPECPDL_INDEX (); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1821 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
|
1822 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1823 cbuf = Fcurrent_buffer (); |
341 | 1824 |
485 | 1825 if (NILP (printflag)) |
341 | 1826 tem = Qsymbolp; |
1827 else | |
1828 tem = printflag; | |
1829 specbind (Qstandard_output, tem); | |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1830 specbind (Qeval_buffer_list, Fcons (cbuf, Veval_buffer_list)); |
341 | 1831 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1832 /* readevalloop calls functions which check the type of start and end. */ |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1833 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1834 !NILP (printflag), Qnil, read_function, |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1835 start, end); |
341 | 1836 |
1837 return unbind_to (count, Qnil); | |
1838 } | |
1839 | |
1840 | |
1841 DEFUN ("read", Fread, Sread, 0, 1, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1842 doc: /* Read one Lisp expression as text from STREAM, return as Lisp object. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1843 If STREAM is nil, use the value of `standard-input' (which see). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1844 STREAM or the value of `standard-input' may be: |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1845 a buffer (read from point and advance it) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1846 a marker (read from where it points and advance it) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1847 a function (call it with no arguments for each character, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1848 call it with a char as argument to push a char back) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1849 a string (takes text from string, starting at the beginning) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1850 t (read text line using minibuffer and use it, or read from |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1851 standard input in batch mode). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1852 (Lisp_Object stream) |
341 | 1853 { |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1854 if (NILP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1855 stream = Vstandard_input; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1856 if (EQ (stream, Qt)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1857 stream = Qread_char; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1858 if (EQ (stream, Qread_char)) |
341 | 1859 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); |
1860 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1861 return read_internal_start (stream, Qnil, Qnil); |
341 | 1862 } |
1863 | |
1864 DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1865 doc: /* Read one Lisp expression which is represented as text by STRING. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1866 Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1867 START and END optionally delimit a substring of STRING from which to read; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1868 they default to 0 and (length STRING) respectively. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1869 (Lisp_Object string, Lisp_Object start, Lisp_Object end) |
341 | 1870 { |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1871 Lisp_Object ret; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1872 CHECK_STRING (string); |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1873 /* read_internal_start sets read_from_string_index. */ |
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1874 ret = read_internal_start (string, start, end); |
45576
0a94e1efe9fc
(Fread_from_string): Don't depend on order of evaluation for C
Colin Walters <walters@gnu.org>
parents:
45554
diff
changeset
|
1875 return Fcons (ret, make_number (read_from_string_index)); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1876 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1877 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1878 /* Function to set up the global context we need in toplevel read |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1879 calls. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1880 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1881 read_internal_start (Lisp_Object stream, Lisp_Object start, Lisp_Object end) |
109131
18f8e88d3829
Fix comments and whitespace.
Juanma Barranquero <lekktu@gmail.com>
parents:
109126
diff
changeset
|
1882 /* start, end only used when stream is a string. */ |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1883 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1884 Lisp_Object retval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1885 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1886 readchar_count = 0; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1887 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1888 read_objects = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1889 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1890 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1891 Vread_symbol_positions_list = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1892 |
89483 | 1893 if (STRINGP (stream) |
1894 || ((CONSP (stream) && STRINGP (XCAR (stream))))) | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1895 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1896 int startval, endval; |
89483 | 1897 Lisp_Object string; |
1898 | |
1899 if (STRINGP (stream)) | |
1900 string = stream; | |
1901 else | |
1902 string = XCAR (stream); | |
1903 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1904 if (NILP (end)) |
89483 | 1905 endval = SCHARS (string); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1906 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1907 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1908 CHECK_NUMBER (end); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1909 endval = XINT (end); |
89483 | 1910 if (endval < 0 || endval > SCHARS (string)) |
1911 args_out_of_range (string, end); | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1912 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1913 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1914 if (NILP (start)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1915 startval = 0; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1916 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1917 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1918 CHECK_NUMBER (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1919 startval = XINT (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1920 if (startval < 0 || startval > endval) |
89483 | 1921 args_out_of_range (string, start); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1922 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1923 read_from_string_index = startval; |
89483 | 1924 read_from_string_index_byte = string_char_to_byte (string, startval); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1925 read_from_string_limit = endval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1926 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
1927 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1928 retval = read0 (stream); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1929 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1930 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1931 Vread_symbol_positions_list = Fnreverse (Vread_symbol_positions_list); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1932 return retval; |
341 | 1933 } |
1934 | |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1935 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1936 /* Signal Qinvalid_read_syntax error. |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1937 S is error string of length N (if > 0) */ |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1938 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1939 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1940 invalid_syntax (const char *s, int n) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1941 { |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1942 if (!n) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1943 n = strlen (s); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1944 xsignal1 (Qinvalid_read_syntax, make_string (s, n)); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1945 } |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1946 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1947 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
1948 /* 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
|
1949 are not allowed. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1950 |
341 | 1951 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1952 read0 (Lisp_Object readcharfun) |
341 | 1953 { |
1954 register Lisp_Object val; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1955 int c; |
341 | 1956 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1957 val = read1 (readcharfun, &c, 0); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1958 if (!c) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1959 return val; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1960 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1961 xsignal1 (Qinvalid_read_syntax, |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1962 Fmake_string (make_number (1), make_number (c))); |
341 | 1963 } |
1964 | |
1965 static int read_buffer_size; | |
1966 static char *read_buffer; | |
1967 | |
88886 | 1968 /* Read a \-escape sequence, assuming we already read the `\'. |
89483 | 1969 If the escape sequence forces unibyte, return eight-bit char. */ |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
1970 |
17038 | 1971 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1972 read_escape (Lisp_Object readcharfun, int stringp) |
341 | 1973 { |
1974 register int c = READCHAR; | |
104853 | 1975 /* \u allows up to four hex digits, \U up to eight. Default to the |
96376
c3309dba6542
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96361
diff
changeset
|
1976 behavior for \u, and change this value in the case that \U is seen. */ |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
1977 int unicode_hex_count = 4; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1978 |
341 | 1979 switch (c) |
1980 { | |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1981 case -1: |
40931
50b111aed6d5
(read_escape): Use end_of_file_error for reporting eof.
Richard M. Stallman <rms@gnu.org>
parents:
40796
diff
changeset
|
1982 end_of_file_error (); |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1983 |
341 | 1984 case 'a': |
485 | 1985 return '\007'; |
341 | 1986 case 'b': |
1987 return '\b'; | |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1988 case 'd': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
1989 return 0177; |
341 | 1990 case 'e': |
1991 return 033; | |
1992 case 'f': | |
1993 return '\f'; | |
1994 case 'n': | |
1995 return '\n'; | |
1996 case 'r': | |
1997 return '\r'; | |
1998 case 't': | |
1999 return '\t'; | |
2000 case 'v': | |
2001 return '\v'; | |
2002 case '\n': | |
2003 return -1; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2004 case ' ': |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2005 if (stringp) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2006 return -1; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2007 return ' '; |
341 | 2008 |
2009 case 'M': | |
2010 c = READCHAR; | |
2011 if (c != '-') | |
2012 error ("Invalid escape character syntax"); | |
2013 c = READCHAR; | |
2014 if (c == '\\') | |
88886 | 2015 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2016 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
|
2017 |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2018 case 'S': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2019 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2020 if (c != '-') |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2021 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
|
2022 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2023 if (c == '\\') |
88886 | 2024 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2025 return c | shift_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2026 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2027 case 'H': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2028 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2029 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2030 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2031 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2032 if (c == '\\') |
88886 | 2033 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2034 return c | hyper_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2035 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2036 case 'A': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2037 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2038 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2039 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2040 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2041 if (c == '\\') |
88886 | 2042 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2043 return c | alt_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2044 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2045 case 's': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2046 c = READCHAR; |
80808
d741e1d7761a
(read_escape): In a string, \s is always space.
Richard M. Stallman <rms@gnu.org>
parents:
76777
diff
changeset
|
2047 if (stringp || c != '-') |
67394
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2048 { |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2049 UNREAD (c); |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2050 return ' '; |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2051 } |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2052 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2053 if (c == '\\') |
88886 | 2054 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2055 return c | super_modifier; |
341 | 2056 |
2057 case 'C': | |
2058 c = READCHAR; | |
2059 if (c != '-') | |
2060 error ("Invalid escape character syntax"); | |
2061 case '^': | |
2062 c = READCHAR; | |
2063 if (c == '\\') | |
88886 | 2064 c = read_escape (readcharfun, 0); |
25251
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2065 if ((c & ~CHAR_MODIFIER_MASK) == '?') |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2066 return 0177 | (c & CHAR_MODIFIER_MASK); |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2067 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
|
2068 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
|
2069 /* 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
|
2070 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
|
2071 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
|
2072 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
|
2073 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
|
2074 return (c & (037 | ~0177)); |
341 | 2075 else |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2076 return c | ctrl_modifier; |
341 | 2077 |
2078 case '0': | |
2079 case '1': | |
2080 case '2': | |
2081 case '3': | |
2082 case '4': | |
2083 case '5': | |
2084 case '6': | |
2085 case '7': | |
2086 /* An octal escape, as in ANSI C. */ | |
2087 { | |
2088 register int i = c - '0'; | |
2089 register int count = 0; | |
2090 while (++count < 3) | |
2091 { | |
2092 if ((c = READCHAR) >= '0' && c <= '7') | |
2093 { | |
2094 i *= 8; | |
2095 i += c - '0'; | |
2096 } | |
2097 else | |
2098 { | |
2099 UNREAD (c); | |
2100 break; | |
2101 } | |
2102 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2103 |
89483 | 2104 if (i >= 0x80 && i < 0x100) |
88886 | 2105 i = BYTE8_TO_CHAR (i); |
341 | 2106 return i; |
2107 } | |
2108 | |
2109 case 'x': | |
2110 /* A hex escape, as in ANSI C. */ | |
2111 { | |
2112 int i = 0; | |
88383 | 2113 int count = 0; |
341 | 2114 while (1) |
2115 { | |
2116 c = READCHAR; | |
2117 if (c >= '0' && c <= '9') | |
2118 { | |
2119 i *= 16; | |
2120 i += c - '0'; | |
2121 } | |
2122 else if ((c >= 'a' && c <= 'f') | |
2123 || (c >= 'A' && c <= 'F')) | |
2124 { | |
2125 i *= 16; | |
2126 if (c >= 'a' && c <= 'f') | |
2127 i += c - 'a' + 10; | |
2128 else | |
2129 i += c - 'A' + 10; | |
2130 } | |
2131 else | |
2132 { | |
2133 UNREAD (c); | |
2134 break; | |
2135 } | |
88383 | 2136 count++; |
341 | 2137 } |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2138 |
88383 | 2139 if (count < 3 && i >= 0x80) |
88886 | 2140 return BYTE8_TO_CHAR (i); |
341 | 2141 return i; |
2142 } | |
2143 | |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2144 case 'U': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2145 /* Post-Unicode-2.0: Up to eight hex chars. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2146 unicode_hex_count = 8; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2147 case 'u': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2148 |
104853 | 2149 /* A Unicode escape. We only permit them in strings and characters, |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2150 not arbitrarily in the source code, as in some other languages. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2151 { |
102300
d7ea9e8841d3
(read_escape): Signal an error for invalid \UXXXXXXXX.
Kenichi Handa <handa@m17n.org>
parents:
102267
diff
changeset
|
2152 unsigned int i = 0; |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2153 int count = 0; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2154 |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2155 while (++count <= unicode_hex_count) |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2156 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2157 c = READCHAR; |
71484
dbe1bcee0357
Fix whitespace of last change.
Eli Zaretskii <eliz@gnu.org>
parents:
71458
diff
changeset
|
2158 /* isdigit and isalpha may be locale-specific, which we don't |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2159 want. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2160 if (c >= '0' && c <= '9') i = (i << 4) + (c - '0'); |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2161 else if (c >= 'a' && c <= 'f') i = (i << 4) + (c - 'a') + 10; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2162 else if (c >= 'A' && c <= 'F') i = (i << 4) + (c - 'A') + 10; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2163 else |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2164 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2165 error ("Non-hex digit used for Unicode escape"); |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2166 break; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2167 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2168 } |
102300
d7ea9e8841d3
(read_escape): Signal an error for invalid \UXXXXXXXX.
Kenichi Handa <handa@m17n.org>
parents:
102267
diff
changeset
|
2169 if (i > 0x10FFFF) |
d7ea9e8841d3
(read_escape): Signal an error for invalid \UXXXXXXXX.
Kenichi Handa <handa@m17n.org>
parents:
102267
diff
changeset
|
2170 error ("Non-Unicode character: 0x%x", i); |
90478
65a8f4ffdbca
(read_escape): Fix the code synched with HEAD.
Kenichi Handa <handa@m17n.org>
parents:
90472
diff
changeset
|
2171 return i; |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2172 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2173 |
341 | 2174 default: |
2175 return c; | |
2176 } | |
2177 } | |
2178 | |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2179 /* Read an integer in radix RADIX using READCHARFUN to read |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2180 characters. RADIX must be in the interval [2..36]; if it isn't, a |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2181 read error is signaled . Value is the integer read. Signals an |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2182 error if encountering invalid read syntax or if RADIX is out of |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2183 range. */ |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2184 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2185 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2186 read_integer (Lisp_Object readcharfun, int radix) |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2187 { |
35543
c809110e1433
(read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents:
34604
diff
changeset
|
2188 int ndigits = 0, invalid_p, c, sign = 0; |
104658
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2189 /* We use a floating point number because */ |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2190 double number = 0; |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2191 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2192 if (radix < 2 || radix > 36) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2193 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2194 else |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2195 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2196 number = ndigits = invalid_p = 0; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2197 sign = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2198 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2199 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2200 if (c == '-') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2201 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2202 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2203 sign = -1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2204 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2205 else if (c == '+') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2206 c = READCHAR; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2207 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2208 while (c >= 0) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2209 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2210 int digit; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2211 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2212 if (c >= '0' && c <= '9') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2213 digit = c - '0'; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2214 else if (c >= 'a' && c <= 'z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2215 digit = c - 'a' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2216 else if (c >= 'A' && c <= 'Z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2217 digit = c - 'A' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2218 else |
28190
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2219 { |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2220 UNREAD (c); |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2221 break; |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2222 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2223 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2224 if (digit < 0 || digit >= radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2225 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2226 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2227 number = radix * number + digit; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2228 ++ndigits; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2229 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2230 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2231 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2232 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2233 if (ndigits == 0 || invalid_p) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2234 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2235 char buf[50]; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2236 sprintf (buf, "integer, radix %d", radix); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2237 invalid_syntax (buf, 0); |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2238 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2239 |
104658
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2240 return make_fixnum_or_float (sign * number); |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2241 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2242 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2243 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2244 /* 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
|
2245 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
|
2246 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
|
2247 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2248 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
|
2249 |
341 | 2250 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2251 read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) |
341 | 2252 { |
2253 register int c; | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2254 int uninterned_symbol = 0; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2255 int multibyte; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2256 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2257 *pch = 0; |
88886 | 2258 load_each_byte = 0; |
341 | 2259 |
2260 retry: | |
2261 | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2262 c = READCHAR_REPORT_MULTIBYTE (&multibyte); |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2263 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2264 end_of_file_error (); |
341 | 2265 |
2266 switch (c) | |
2267 { | |
2268 case '(': | |
2269 return read_list (0, readcharfun); | |
2270 | |
2271 case '[': | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2272 return read_vector (readcharfun, 0); |
341 | 2273 |
2274 case ')': | |
2275 case ']': | |
2276 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2277 *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
|
2278 return Qnil; |
341 | 2279 } |
2280 | |
2281 case '#': | |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2282 c = READCHAR; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2283 if (c == 's') |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2284 { |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2285 c = READCHAR; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2286 if (c == '(') |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2287 { |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2288 /* Accept extended format for hashtables (extensible to |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2289 other types), e.g. |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2290 #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */ |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2291 Lisp_Object tmp = read_list (0, readcharfun); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2292 Lisp_Object head = CAR_SAFE (tmp); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2293 Lisp_Object data = Qnil; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2294 Lisp_Object val = Qnil; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2295 /* The size is 2 * number of allowed keywords to |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2296 make-hash-table. */ |
104853 | 2297 Lisp_Object params[10]; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2298 Lisp_Object ht; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2299 Lisp_Object key = Qnil; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2300 int param_count = 0; |
104853 | 2301 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2302 if (!EQ (head, Qhash_table)) |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2303 error ("Invalid extended read marker at head of #s list " |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2304 "(only hash-table allowed)"); |
104853 | 2305 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2306 tmp = CDR_SAFE (tmp); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2307 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2308 /* This is repetitive but fast and simple. */ |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2309 params[param_count] = QCsize; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2310 params[param_count+1] = Fplist_get (tmp, Qsize); |
109271
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2311 if (!NILP (params[param_count + 1])) |
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2312 param_count += 2; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2313 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2314 params[param_count] = QCtest; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2315 params[param_count+1] = Fplist_get (tmp, Qtest); |
109271
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2316 if (!NILP (params[param_count + 1])) |
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2317 param_count += 2; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2318 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2319 params[param_count] = QCweakness; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2320 params[param_count+1] = Fplist_get (tmp, Qweakness); |
109271
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2321 if (!NILP (params[param_count + 1])) |
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2322 param_count += 2; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2323 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2324 params[param_count] = QCrehash_size; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2325 params[param_count+1] = Fplist_get (tmp, Qrehash_size); |
109271
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2326 if (!NILP (params[param_count + 1])) |
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2327 param_count += 2; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2328 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2329 params[param_count] = QCrehash_threshold; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2330 params[param_count+1] = Fplist_get (tmp, Qrehash_threshold); |
109271
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2331 if (!NILP (params[param_count + 1])) |
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2332 param_count += 2; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2333 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2334 /* This is the hashtable data. */ |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2335 data = Fplist_get (tmp, Qdata); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2336 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2337 /* Now use params to make a new hashtable and fill it. */ |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2338 ht = Fmake_hash_table (param_count, params); |
104853 | 2339 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2340 while (CONSP (data)) |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2341 { |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2342 key = XCAR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2343 data = XCDR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2344 if (!CONSP (data)) |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2345 error ("Odd number of elements in hashtable data"); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2346 val = XCAR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2347 data = XCDR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2348 Fputhash (key, val, ht); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2349 } |
104853 | 2350 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2351 return ht; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2352 } |
109271
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2353 UNREAD (c); |
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2354 invalid_syntax ("#", 1); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2355 } |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2356 if (c == '^') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2357 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2358 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2359 if (c == '[') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2360 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2361 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2362 tmp = read_vector (readcharfun, 0); |
90830
e33fffaa9534
(read1): Use CHAR_TABLE_STANDARD_SLOTS to validate
Andreas Schwab <schwab@suse.de>
parents:
90796
diff
changeset
|
2363 if (XVECTOR (tmp)->size < CHAR_TABLE_STANDARD_SLOTS) |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2364 error ("Invalid size char-table"); |
85356
689fd5665496
(read1): Set pvectype for char_tables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85330
diff
changeset
|
2365 XSETPVECTYPE (XVECTOR (tmp), PVEC_CHAR_TABLE); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2366 return tmp; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2367 } |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2368 else if (c == '^') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2369 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2370 c = READCHAR; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2371 if (c == '[') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2372 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2373 Lisp_Object tmp; |
88383 | 2374 int depth, size; |
89483 | 2375 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2376 tmp = read_vector (readcharfun, 0); |
88383 | 2377 if (!INTEGERP (AREF (tmp, 0))) |
2378 error ("Invalid depth in char-table"); | |
2379 depth = XINT (AREF (tmp, 0)); | |
2380 if (depth < 1 || depth > 3) | |
2381 error ("Invalid depth in char-table"); | |
89996
d13df8a735d7
(read1): Fix reading of a char-table.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2382 size = XVECTOR (tmp)->size - 2; |
88383 | 2383 if (chartab_size [depth] != size) |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2384 error ("Invalid size char-table"); |
91046 | 2385 XSETPVECTYPE (XVECTOR (tmp), PVEC_SUB_CHAR_TABLE); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2386 return tmp; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2387 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2388 invalid_syntax ("#^^", 3); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2389 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2390 invalid_syntax ("#^", 2); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2391 } |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2392 if (c == '&') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2393 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2394 Lisp_Object length; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2395 length = read1 (readcharfun, pch, first_in_list); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2396 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2397 if (c == '"') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2398 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2399 Lisp_Object tmp, val; |
55158
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2400 int size_in_chars |
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2401 = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1) |
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2402 / BOOL_VECTOR_BITS_PER_CHAR); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2403 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2404 UNREAD (c); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2405 tmp = read1 (readcharfun, pch, first_in_list); |
88886 | 2406 if (STRING_MULTIBYTE (tmp) |
89483 | 2407 || (size_in_chars != SCHARS (tmp) |
88886 | 2408 /* We used to print 1 char too many |
2409 when the number of bits was a multiple of 8. | |
2410 Accept such input in case it came from an old | |
2411 version. */ | |
2412 && ! (XFASTINT (length) | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2413 == (SCHARS (tmp) - 1) * BOOL_VECTOR_BITS_PER_CHAR))) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2414 invalid_syntax ("#&...", 5); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2415 |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2416 val = Fmake_bool_vector (length, Qnil); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
2417 memcpy (XBOOL_VECTOR (val)->data, SDATA (tmp), size_in_chars); |
21935
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
2418 /* Clear the extraneous bits in the last byte. */ |
55158
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2419 if (XINT (length) != size_in_chars * BOOL_VECTOR_BITS_PER_CHAR) |
21935
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
2420 XBOOL_VECTOR (val)->data[size_in_chars - 1] |
55158
e69f42e233dc
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
Andreas Schwab <schwab@suse.de>
parents:
55150
diff
changeset
|
2421 &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1; |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2422 return val; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2423 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2424 invalid_syntax ("#&...", 5); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2425 } |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2426 if (c == '[') |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2427 { |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2428 /* 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
|
2429 build them using function calls. */ |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2430 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2431 tmp = read_vector (readcharfun, 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2432 return Fmake_byte_code (XVECTOR (tmp)->size, |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2433 XVECTOR (tmp)->contents); |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2434 } |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2435 if (c == '(') |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2436 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2437 Lisp_Object tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2438 struct gcpro gcpro1; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2439 int ch; |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2440 |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2441 /* 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
|
2442 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
|
2443 if (ch != 0 || !STRINGP (tmp)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2444 invalid_syntax ("#", 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2445 GCPRO1 (tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2446 /* Read the intervals and their properties. */ |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2447 while (1) |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2448 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2449 Lisp_Object beg, end, plist; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2450 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2451 beg = read1 (readcharfun, &ch, 0); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
2452 end = plist = Qnil; |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2453 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
|
2454 break; |
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2455 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2456 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
|
2457 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2458 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
|
2459 if (ch) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2460 invalid_syntax ("Invalid string property list", 0); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2461 Fset_text_properties (beg, end, plist, tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2462 } |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2463 UNGCPRO; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2464 return tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2465 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2466 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2467 /* #@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
|
2468 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
|
2469 and function definitions. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2470 if (c == '@') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2471 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2472 int i, nskip = 0; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2473 |
88886 | 2474 load_each_byte = 1; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2475 /* Read a decimal integer. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2476 while ((c = READCHAR) >= 0 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2477 && c >= '0' && c <= '9') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2478 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2479 nskip *= 10; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2480 nskip += c - '0'; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2481 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2482 if (c >= 0) |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2483 UNREAD (c); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2484 |
88886 | 2485 if (load_force_doc_strings |
2486 && (EQ (readcharfun, Qget_file_char) | |
2487 || EQ (readcharfun, Qget_emacs_mule_file_char))) | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2488 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2489 /* 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
|
2490 record the last string that we skipped, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2491 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
|
2492 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2493 /* But first exchange saved_doc_string |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2494 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
|
2495 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2496 char *temp = saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2497 int temp_size = saved_doc_string_size; |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
2498 file_offset temp_pos = saved_doc_string_position; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2499 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
|
2500 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2501 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
|
2502 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
|
2503 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
|
2504 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
|
2505 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2506 prev_saved_doc_string = temp; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2507 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
|
2508 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
|
2509 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
|
2510 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2511 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2512 if (saved_doc_string_size == 0) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2513 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2514 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
|
2515 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
|
2516 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2517 if (nskip > saved_doc_string_size) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2518 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2519 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
|
2520 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
|
2521 saved_doc_string_size); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2522 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2523 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
2524 saved_doc_string_position = file_tell (instream); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2525 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2526 /* Copy that many characters into saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2527 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2528 saved_doc_string[i] = c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2529 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2530 saved_doc_string_length = i; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2531 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2532 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2533 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2534 /* Skip that many characters. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2535 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2536 c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2537 } |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
2538 |
88886 | 2539 load_each_byte = 0; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2540 goto retry; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2541 } |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2542 if (c == '!') |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2543 { |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2544 /* #! appears at the beginning of an executable file. |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2545 Skip the first line. */ |
50138
75ed0f4a2f18
(read1): After #!, exit loop on eof.
Richard M. Stallman <rms@gnu.org>
parents:
49979
diff
changeset
|
2546 while (c != '\n' && c >= 0) |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2547 c = READCHAR; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2548 goto retry; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2549 } |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2550 if (c == '$') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2551 return Vload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2552 if (c == '\'') |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2553 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
|
2554 /* #: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
|
2555 if (c == ':') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2556 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2557 uninterned_symbol = 1; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2558 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2559 goto default_label; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2560 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2561 /* 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
|
2562 if (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2563 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2564 int n = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2565 Lisp_Object tem; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2566 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2567 /* Read a non-negative integer. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2568 while (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2569 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2570 n *= 10; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2571 n += c - '0'; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2572 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2573 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2574 /* #n=object returns object, but associates it with n for #n#. */ |
103101
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
2575 if (c == '=' && !NILP (Vread_circle)) |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2576 { |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2577 /* 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
|
2578 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2579 Lisp_Object cell; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2580 |
104853 | 2581 placeholder = Fcons (Qnil, Qnil); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2582 cell = Fcons (make_number (n), placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2583 read_objects = Fcons (cell, read_objects); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2584 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2585 /* Read the object itself. */ |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2586 tem = read0 (readcharfun); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2587 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2588 /* 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
|
2589 substitute_object_in_subtree (tem, placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2590 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2591 /* ...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
|
2592 Fsetcdr (cell, tem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2593 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2594 return tem; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2595 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2596 /* #n# returns a previously read object. */ |
103101
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
2597 if (c == '#' && !NILP (Vread_circle)) |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2598 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2599 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
|
2600 if (CONSP (tem)) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2601 return XCDR (tem); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2602 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2603 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2604 else if (c == 'r' || c == 'R') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2605 return read_integer (readcharfun, n); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2606 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2607 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2608 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2609 else if (c == 'x' || c == 'X') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2610 return read_integer (readcharfun, 16); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2611 else if (c == 'o' || c == 'O') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2612 return read_integer (readcharfun, 8); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2613 else if (c == 'b' || c == 'B') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2614 return read_integer (readcharfun, 2); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2615 |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2616 UNREAD (c); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2617 invalid_syntax ("#", 1); |
341 | 2618 |
2619 case ';': | |
2620 while ((c = READCHAR) >= 0 && c != '\n'); | |
2621 goto retry; | |
2622 | |
2623 case '\'': | |
2624 { | |
2625 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil)); | |
2626 } | |
2627 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2628 case '`': |
109137
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2629 { |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2630 int next_char = READCHAR; |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2631 UNREAD (next_char); |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2632 /* Transition from old-style to new-style: |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2633 If we see "(`" it used to mean old-style, which usually works |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2634 fine because ` should almost never appear in such a position |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2635 for new-style. But occasionally we need "(`" to mean new |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2636 style, so we try to distinguish the two by the fact that we |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2637 can either write "( `foo" or "(` foo", where the first |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2638 intends to use new-style whereas the second intends to use |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2639 old-style. For Emacs-25, we should completely remove this |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2640 first_in_list exception (old-style can still be obtained via |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2641 "(\`" anyway). */ |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2642 if (first_in_list && next_char == ' ') |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2643 { |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2644 Vold_style_backquotes = Qt; |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2645 goto default_label; |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2646 } |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2647 else |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2648 { |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2649 Lisp_Object value; |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2650 |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2651 new_backquote_flag++; |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2652 value = read0 (readcharfun); |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2653 new_backquote_flag--; |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2654 |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2655 return Fcons (Qbackquote, Fcons (value, Qnil)); |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2656 } |
14077aaa95b4
* src/lread.c (read1): Fix up last change to not mess up `c'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109131
diff
changeset
|
2657 } |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2658 case ',': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2659 if (new_backquote_flag) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2660 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2661 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
|
2662 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2663 int ch = READCHAR; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2664 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2665 if (ch == '@') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2666 comma_type = Qcomma_at; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2667 else if (ch == '.') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2668 comma_type = Qcomma_dot; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2669 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2670 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2671 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
|
2672 comma_type = Qcomma; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2673 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2674 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2675 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2676 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2677 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2678 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
|
2679 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2680 else |
78612
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2681 { |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2682 Vold_style_backquotes = Qt; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2683 goto default_label; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2684 } |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2685 |
341 | 2686 case '?': |
2687 { | |
88886 | 2688 int modifiers; |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2689 int next_char; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2690 int ok; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2691 |
341 | 2692 c = READCHAR; |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2693 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2694 end_of_file_error (); |
341 | 2695 |
49979
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2696 /* Accept `single space' syntax like (list ? x) where the |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2697 whitespace character is SPC or TAB. |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2698 Other literal whitespace like NL, CR, and FF are not accepted, |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2699 as there are well-established escape sequences for these. */ |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2700 if (c == ' ' || c == '\t') |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2701 return make_number (c); |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2702 |
341 | 2703 if (c == '\\') |
88886 | 2704 c = read_escape (readcharfun, 0); |
2705 modifiers = c & CHAR_MODIFIER_MASK; | |
2706 c &= ~CHAR_MODIFIER_MASK; | |
2707 if (CHAR_BYTE8_P (c)) | |
2708 c = CHAR_TO_BYTE8 (c); | |
2709 c |= modifiers; | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2710 |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2711 next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2712 if (next_char == '.') |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2713 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2714 /* Only a dotted-pair dot is valid after a char constant. */ |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2715 int next_next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2716 UNREAD (next_next_char); |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2717 |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2718 ok = (next_next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2719 || (next_next_char < 0200 |
109315
8f3464b85afb
Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents:
109313
diff
changeset
|
2720 && (strchr ("\"';([#?", next_next_char) |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2721 || (!first_in_list && next_next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2722 || (new_backquote_flag && next_next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2723 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2724 else |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2725 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2726 ok = (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2727 || (next_char < 0200 |
109315
8f3464b85afb
Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents:
109313
diff
changeset
|
2728 && (strchr ("\"';()[]#?", next_char) |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2729 || (!first_in_list && next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2730 || (new_backquote_flag && next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2731 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2732 UNREAD (next_char); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2733 if (ok) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2734 return make_number (c); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2735 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2736 invalid_syntax ("?", 1); |
341 | 2737 } |
2738 | |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
2739 case '"': |
341 | 2740 { |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2741 char *p = read_buffer; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2742 char *end = read_buffer + read_buffer_size; |
341 | 2743 register int c; |
88383 | 2744 /* Nonzero if we saw an escape sequence specifying |
2745 a multibyte character. */ | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2746 int force_multibyte = 0; |
88383 | 2747 /* Nonzero if we saw an escape sequence specifying |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2748 a single-byte character. */ |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2749 int force_singlebyte = 0; |
341 | 2750 int cancel = 0; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2751 int nchars = 0; |
341 | 2752 |
2753 while ((c = READCHAR) >= 0 | |
2754 && c != '\"') | |
2755 { | |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2756 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2757 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2758 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2759 read_buffer = (char *) xrealloc (read_buffer, |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2760 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2761 p = read_buffer + offset; |
341 | 2762 end = read_buffer + read_buffer_size; |
2763 } | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2764 |
341 | 2765 if (c == '\\') |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2766 { |
88383 | 2767 int modifiers; |
88886 | 2768 |
2769 c = read_escape (readcharfun, 1); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2770 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2771 /* 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
|
2772 if (c == -1) |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2773 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2774 if (p == read_buffer) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2775 cancel = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2776 continue; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2777 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2778 |
88383 | 2779 modifiers = c & CHAR_MODIFIER_MASK; |
2780 c = c & ~CHAR_MODIFIER_MASK; | |
2781 | |
88886 | 2782 if (CHAR_BYTE8_P (c)) |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2783 force_singlebyte = 1; |
88886 | 2784 else if (! ASCII_CHAR_P (c)) |
2785 force_multibyte = 1; | |
2786 else /* i.e. ASCII_CHAR_P (c) */ | |
88383 | 2787 { |
2788 /* Allow `\C- ' and `\C-?'. */ | |
2789 if (modifiers == CHAR_CTL) | |
2790 { | |
2791 if (c == ' ') | |
2792 c = 0, modifiers = 0; | |
2793 else if (c == '?') | |
2794 c = 127, modifiers = 0; | |
2795 } | |
2796 if (modifiers & CHAR_SHIFT) | |
2797 { | |
2798 /* Shift modifier is valid only with [A-Za-z]. */ | |
2799 if (c >= 'A' && c <= 'Z') | |
2800 modifiers &= ~CHAR_SHIFT; | |
2801 else if (c >= 'a' && c <= 'z') | |
2802 c -= ('a' - 'A'), modifiers &= ~CHAR_SHIFT; | |
2803 } | |
2804 | |
2805 if (modifiers & CHAR_META) | |
2806 { | |
2807 /* Move the meta bit to the right place for a | |
2808 string. */ | |
2809 modifiers &= ~CHAR_META; | |
2810 c = BYTE8_TO_CHAR (c | 0x80); | |
2811 force_singlebyte = 1; | |
2812 } | |
2813 } | |
2814 | |
2815 /* Any modifiers remaining are invalid. */ | |
2816 if (modifiers) | |
2817 error ("Invalid modifier in string"); | |
2818 p += CHAR_STRING (c, (unsigned char *) p); | |
341 | 2819 } |
88886 | 2820 else |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
2821 { |
88383 | 2822 p += CHAR_STRING (c, (unsigned char *) p); |
89453
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2823 if (CHAR_BYTE8_P (c)) |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2824 force_singlebyte = 1; |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2825 else if (! ASCII_CHAR_P (c)) |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2826 force_multibyte = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2827 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2828 nchars++; |
341 | 2829 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2830 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2831 if (c < 0) |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2832 end_of_file_error (); |
341 | 2833 |
2834 /* If purifying, and string starts with \ newline, | |
2835 return zero instead. This is for doc strings | |
604 | 2836 that we are really going to find in etc/DOC.nn.nn */ |
485 | 2837 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) |
341 | 2838 return make_number (0); |
2839 | |
88383 | 2840 if (force_multibyte) |
2841 /* READ_BUFFER already contains valid multibyte forms. */ | |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2842 ; |
88383 | 2843 else if (force_singlebyte) |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2844 { |
88383 | 2845 nchars = str_as_unibyte (read_buffer, p - read_buffer); |
2846 p = read_buffer + nchars; | |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2847 } |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2848 else |
88383 | 2849 /* Otherwise, READ_BUFFER contains only ASCII. */ |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2850 ; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2851 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2852 /* We want readchar_count to be the number of characters, not |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2853 bytes. Hence we adjust for multibyte characters in the |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2854 string. ... But it doesn't seem to be necessary, because |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2855 READCHAR *does* read multibyte characters from buffers. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2856 /* readchar_count -= (p - read_buffer) - nchars; */ |
341 | 2857 if (read_pure) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2858 return make_pure_string (read_buffer, nchars, p - read_buffer, |
88383 | 2859 (force_multibyte |
2860 || (p - read_buffer != nchars))); | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2861 return make_specified_string (read_buffer, nchars, p - read_buffer, |
88383 | 2862 (force_multibyte |
2863 || (p - read_buffer != nchars))); | |
341 | 2864 } |
2865 | |
762 | 2866 case '.': |
2867 { | |
2868 int next_char = READCHAR; | |
2869 UNREAD (next_char); | |
2870 | |
28746
42f2ded9d9db
(read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents:
28733
diff
changeset
|
2871 if (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2872 || (next_char < 0200 |
109315
8f3464b85afb
Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents:
109313
diff
changeset
|
2873 && (strchr ("\"';([#?", next_char) |
58093
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2874 || (!first_in_list && next_char == '`') |
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2875 || (new_backquote_flag && next_char == ',')))) |
762 | 2876 { |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2877 *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
|
2878 return Qnil; |
762 | 2879 } |
2880 | |
2881 /* Otherwise, we fall through! Note that the atom-reading loop | |
2882 below will now loop at least once, assuring that we will not | |
2883 try to UNREAD two characters in a row. */ | |
2884 } | |
341 | 2885 default: |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2886 default_label: |
341 | 2887 if (c <= 040) goto retry; |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2888 if (c == 0x8a0) /* NBSP */ |
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2889 goto retry; |
341 | 2890 { |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2891 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
|
2892 int quoted = 0; |
341 | 2893 |
2894 { | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2895 char *end = read_buffer + read_buffer_size; |
341 | 2896 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2897 while (c > 040 |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2898 && c != 0x8a0 /* NBSP */ |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2899 && (c >= 0200 |
109315
8f3464b85afb
Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents:
109313
diff
changeset
|
2900 || (!strchr ("\"';()[]#", c) |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2901 && !(!first_in_list && c == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2902 && !(new_backquote_flag && c == ',')))) |
341 | 2903 { |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2904 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2905 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2906 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2907 read_buffer = (char *) xrealloc (read_buffer, |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2908 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2909 p = read_buffer + offset; |
341 | 2910 end = read_buffer + read_buffer_size; |
2911 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2912 |
341 | 2913 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
|
2914 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2915 c = READCHAR; |
34604
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2916 if (c == -1) |
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2917 end_of_file_error (); |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2918 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
|
2919 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2920 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2921 if (multibyte) |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2922 p += CHAR_STRING (c, p); |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2923 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2924 *p++ = c; |
341 | 2925 c = READCHAR; |
2926 } | |
2927 | |
2928 if (p == end) | |
2929 { | |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2930 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2931 read_buffer = (char *) xrealloc (read_buffer, |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2932 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2933 p = read_buffer + offset; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2934 end = read_buffer + read_buffer_size; |
341 | 2935 } |
2936 *p = 0; | |
2937 if (c >= 0) | |
2938 UNREAD (c); | |
2939 } | |
2940 | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2941 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
|
2942 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2943 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
|
2944 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
|
2945 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
|
2946 /* 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
|
2947 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
|
2948 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2949 while (p1 != p && (c = *p1) >= '0' && c <= '9') p1++; |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2950 /* 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
|
2951 if (p1 > read_buffer && p1 < p && *p1 == '.') p1++; |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2952 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
|
2953 /* 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
|
2954 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2955 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
|
2956 p1[-1] = '\0'; |
104658
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2957 { |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2958 /* EMACS_INT n = atol (read_buffer); */ |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2959 char *endptr = NULL; |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2960 EMACS_INT n = (errno = 0, |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2961 strtol (read_buffer, &endptr, 10)); |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2962 if (errno == ERANGE && endptr) |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2963 { |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2964 Lisp_Object args |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2965 = Fcons (make_string (read_buffer, |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2966 endptr - read_buffer), |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2967 Qnil); |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2968 xsignal (Qoverflow_error, args); |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2969 } |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2970 return make_fixnum_or_float (n); |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2971 } |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2972 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2973 } |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2974 if (isfloat_string (read_buffer, 0)) |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2975 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2976 /* 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
|
2977 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
|
2978 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
|
2979 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
|
2980 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2981 double value; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2982 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2983 /* 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
|
2984 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
|
2985 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
|
2986 drops the sign. */ |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2987 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
|
2988 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2989 /* 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
|
2990 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
|
2991 switch (p[-1]) |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
2992 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2993 case 'F': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2994 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
|
2995 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2996 case 'N': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
2997 value = zero / zero; |
63755
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2998 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
2999 /* If that made a "negative" NaN, negate it. */ |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3000 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3001 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3002 int i; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3003 union { double d; char c[sizeof (double)]; } u_data, u_minus_zero; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3004 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3005 u_data.d = value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3006 u_minus_zero.d = - 0.0; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3007 for (i = 0; i < sizeof (double); i++) |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3008 if (u_data.c[i] & u_minus_zero.c[i]) |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3009 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3010 value = - value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3011 break; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3012 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3013 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3014 /* Now VALUE is a positive NaN. */ |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3015 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3016 default: |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3017 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
|
3018 break; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3019 } |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3020 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3021 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
|
3022 } |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
3023 } |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3024 { |
91185
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3025 Lisp_Object name, result; |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3026 EMACS_INT nbytes = p - read_buffer; |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3027 EMACS_INT nchars |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3028 = (multibyte ? multibyte_chars_in_text (read_buffer, nbytes) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3029 : nbytes); |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3030 |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3031 if (uninterned_symbol && ! NILP (Vpurify_flag)) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3032 name = make_pure_string (read_buffer, nchars, nbytes, multibyte); |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3033 else |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3034 name = make_specified_string (read_buffer, nchars, nbytes,multibyte); |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3035 result = (uninterned_symbol ? Fmake_symbol (name) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3036 : Fintern (name, Qnil)); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
3037 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3038 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3039 || EQ (Vread_with_symbol_positions, readcharfun)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3040 Vread_symbol_positions_list = |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3041 /* Kind of a hack; this will probably fail if characters |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3042 in the symbol name were escaped. Not really a big |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3043 deal, though. */ |
45747
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3044 Fcons (Fcons (result, |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3045 make_number (readchar_count |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3046 - XFASTINT (Flength (Fsymbol_name (result))))), |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3047 Vread_symbol_positions_list); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3048 return result; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3049 } |
341 | 3050 } |
3051 } | |
3052 } | |
3053 | |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3054 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3055 /* 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
|
3056 static Lisp_Object seen_list; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3057 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3058 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3059 substitute_object_in_subtree (Lisp_Object object, Lisp_Object placeholder) |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3060 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3061 Lisp_Object check_object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3062 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3063 /* 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
|
3064 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3065 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3066 /* Make all the substitutions. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3067 check_object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3068 = substitute_object_recurse (object, placeholder, object); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3069 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3070 /* 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
|
3071 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3072 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3073 /* 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
|
3074 original. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3075 if (!EQ (check_object, object)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3076 error ("Unexpected mutation error in reader"); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3077 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3078 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3079 /* Feval doesn't get called from here, so no gc protection is needed. */ |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3080 #define SUBSTITUTE(get_val, set_val) \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3081 do { \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3082 Lisp_Object old_value = get_val; \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3083 Lisp_Object true_value \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3084 = substitute_object_recurse (object, placeholder, \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3085 old_value); \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3086 \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3087 if (!EQ (old_value, true_value)) \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3088 { \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3089 set_val; \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3090 } \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3091 } while (0) |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3092 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3093 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3094 substitute_object_recurse (Lisp_Object object, Lisp_Object placeholder, Lisp_Object subtree) |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3095 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3096 /* 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
|
3097 if (EQ (placeholder, subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3098 return object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3099 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3100 /* 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
|
3101 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
|
3102 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3103 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3104 /* 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
|
3105 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
|
3106 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
|
3107 read_objects. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3108 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
|
3109 seen_list = Fcons (subtree, seen_list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3110 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3111 /* Recurse according to subtree's type. |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3112 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
|
3113 switch (XTYPE (subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3114 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3115 case Lisp_Vectorlike: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3116 { |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3117 int i, length = 0; |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3118 if (BOOL_VECTOR_P (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3119 return subtree; /* No sub-objects anyway. */ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3120 else if (CHAR_TABLE_P (subtree) || SUB_CHAR_TABLE_P (subtree) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3121 || COMPILEDP (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3122 length = ASIZE (subtree) & PSEUDOVECTOR_SIZE_MASK; |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3123 else if (VECTORP (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3124 length = ASIZE (subtree); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3125 else |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3126 /* An unknown pseudovector may contain non-Lisp fields, so we |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3127 can't just blindly traverse all its fields. We used to call |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95860
diff
changeset
|
3128 `Flength' which signaled `sequencep', so I just preserved this |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3129 behavior. */ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3130 wrong_type_argument (Qsequencep, subtree); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3131 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3132 for (i = 0; i < length; i++) |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3133 SUBSTITUTE (AREF (subtree, i), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3134 ASET (subtree, i, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3135 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3136 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3137 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3138 case Lisp_Cons: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3139 { |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3140 SUBSTITUTE (XCAR (subtree), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3141 XSETCAR (subtree, true_value)); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3142 SUBSTITUTE (XCDR (subtree), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3143 XSETCDR (subtree, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3144 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3145 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3146 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3147 case Lisp_String: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3148 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3149 /* Check for text properties in each interval. |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
3150 substitute_in_interval contains part of the logic. */ |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3151 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3152 INTERVAL root_interval = STRING_INTERVALS (subtree); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3153 Lisp_Object arg = Fcons (object, placeholder); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3154 |
39857
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3155 traverse_intervals_noorder (root_interval, |
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3156 &substitute_in_interval, arg); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3157 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3158 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3159 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3160 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3161 /* 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
|
3162 default: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3163 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3164 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3165 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3166 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3167 /* Helper function for substitute_object_recurse. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3168 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3169 substitute_in_interval (INTERVAL interval, Lisp_Object arg) |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3170 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3171 Lisp_Object object = Fcar (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3172 Lisp_Object placeholder = Fcdr (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3173 |
104853 | 3174 SUBSTITUTE (interval->plist, interval->plist = true_value); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3175 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3176 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3177 |
341 | 3178 #define LEAD_INT 1 |
3179 #define DOT_CHAR 2 | |
3180 #define TRAIL_INT 4 | |
3181 #define E_CHAR 8 | |
3182 #define EXP_INT 16 | |
3183 | |
3184 int | |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3185 isfloat_string (const char *cp, int ignore_trailing) |
341 | 3186 { |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3187 int state; |
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3188 const char *start = cp; |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3189 |
341 | 3190 state = 0; |
3191 if (*cp == '+' || *cp == '-') | |
3192 cp++; | |
3193 | |
9871 | 3194 if (*cp >= '0' && *cp <= '9') |
341 | 3195 { |
3196 state |= LEAD_INT; | |
9871 | 3197 while (*cp >= '0' && *cp <= '9') |
3198 cp++; | |
341 | 3199 } |
3200 if (*cp == '.') | |
3201 { | |
3202 state |= DOT_CHAR; | |
3203 cp++; | |
3204 } | |
9871 | 3205 if (*cp >= '0' && *cp <= '9') |
341 | 3206 { |
3207 state |= TRAIL_INT; | |
9871 | 3208 while (*cp >= '0' && *cp <= '9') |
341 | 3209 cp++; |
3210 } | |
16342
b91af71f45f1
(isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents:
16228
diff
changeset
|
3211 if (*cp == 'e' || *cp == 'E') |
341 | 3212 { |
3213 state |= E_CHAR; | |
3214 cp++; | |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3215 if (*cp == '+' || *cp == '-') |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3216 cp++; |
341 | 3217 } |
3218 | |
9871 | 3219 if (*cp >= '0' && *cp <= '9') |
341 | 3220 { |
3221 state |= EXP_INT; | |
9871 | 3222 while (*cp >= '0' && *cp <= '9') |
341 | 3223 cp++; |
3224 } | |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3225 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
|
3226 ; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3227 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
|
3228 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3229 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3230 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3231 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3232 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
|
3233 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3234 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3235 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3236 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3237 |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
3238 return ((ignore_trailing |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3239 || *cp == 0 || *cp == ' ' || *cp == '\t' || *cp == '\n' |
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3240 || *cp == '\r' || *cp == '\f') |
341 | 3241 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) |
826 | 3242 || state == (DOT_CHAR|TRAIL_INT) |
341 | 3243 || state == (LEAD_INT|E_CHAR|EXP_INT) |
826 | 3244 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT) |
3245 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT))); | |
341 | 3246 } |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27645
diff
changeset
|
3247 |
341 | 3248 |
3249 static Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3250 read_vector (Lisp_Object readcharfun, int bytecodeflag) |
341 | 3251 { |
3252 register int i; | |
3253 register int size; | |
3254 register Lisp_Object *ptr; | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3255 register Lisp_Object tem, item, vector; |
341 | 3256 register struct Lisp_Cons *otem; |
3257 Lisp_Object len; | |
3258 | |
3259 tem = read_list (1, readcharfun); | |
3260 len = Flength (tem); | |
3261 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil)); | |
3262 | |
3263 size = XVECTOR (vector)->size; | |
3264 ptr = XVECTOR (vector)->contents; | |
3265 for (i = 0; i < size; i++) | |
3266 { | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3267 item = Fcar (tem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3268 /* 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
|
3269 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
|
3270 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
|
3271 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
|
3272 if (bytecodeflag && load_force_doc_strings) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3273 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3274 if (i == COMPILED_BYTECODE) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3275 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3276 if (!STRINGP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3277 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3278 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3279 /* 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
|
3280 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
|
3281 constants slot is nil). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3282 ptr[COMPILED_CONSTANTS] = item; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3283 item = Qnil; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3284 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3285 else if (i == COMPILED_CONSTANTS) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3286 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3287 Lisp_Object bytestr = ptr[COMPILED_CONSTANTS]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3288 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3289 if (NILP (item)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3290 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3291 /* 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
|
3292 but without generating extra garbage and |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3293 guaranteeing no change in the contents). */ |
46375
e90f58d3450c
* lread.c (read_vector): Use STRING_SET_CHARS.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
3294 STRING_SET_CHARS (bytestr, SBYTES (bytestr)); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3295 STRING_SET_UNIBYTE (bytestr); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3296 |
88886 | 3297 item = Fread (Fcons (bytestr, readcharfun)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3298 if (!CONSP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3299 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3300 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3301 otem = XCONS (item); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3302 bytestr = XCAR (item); |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3303 item = XCDR (item); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3304 free_cons (otem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3305 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3306 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3307 /* Now handle the bytecode slot. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3308 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
|
3309 } |
88886 | 3310 else if (i == COMPILED_DOC_STRING |
3311 && STRINGP (item) | |
3312 && ! STRING_MULTIBYTE (item)) | |
3313 { | |
3314 if (EQ (readcharfun, Qget_emacs_mule_file_char)) | |
3315 item = Fdecode_coding_string (item, Qemacs_mule, Qnil, Qnil); | |
3316 else | |
3317 item = Fstring_as_multibyte (item); | |
3318 } | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3319 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3320 ptr[i] = read_pure ? Fpurecopy (item) : item; |
341 | 3321 otem = XCONS (tem); |
3322 tem = Fcdr (tem); | |
3323 free_cons (otem); | |
3324 } | |
3325 return vector; | |
3326 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3327 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
3328 /* 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
|
3329 FLAG = -1 means check for starting with defun |
341 | 3330 and make structure pure. */ |
3331 | |
3332 static Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3333 read_list (int flag, register Lisp_Object readcharfun) |
341 | 3334 { |
3335 /* -1 means check next element for defun, | |
3336 0 means don't check, | |
3337 1 means already checked and found defun. */ | |
3338 int defunflag = flag < 0 ? -1 : 0; | |
3339 Lisp_Object val, tail; | |
3340 register Lisp_Object elt, tem; | |
3341 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
|
3342 /* 0 is the normal case. |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3343 1 means this list is a doc reference; replace it with the number 0. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3344 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
|
3345 int doc_reference = 0; |
341 | 3346 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3347 /* 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
|
3348 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
|
3349 |
341 | 3350 val = Qnil; |
3351 tail = Qnil; | |
3352 | |
3353 while (1) | |
3354 { | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3355 int ch; |
341 | 3356 GCPRO2 (val, tail); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3357 elt = read1 (readcharfun, &ch, first_in_list); |
341 | 3358 UNGCPRO; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3359 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3360 first_in_list = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3361 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3362 /* 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
|
3363 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
|
3364 && ! 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
|
3365 && !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
|
3366 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3367 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
|
3368 /* 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
|
3369 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
|
3370 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
|
3371 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
|
3372 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
|
3373 else |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3374 /* 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
|
3375 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
|
3376 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
|
3377 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
|
3378 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
|
3379 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
|
3380 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
|
3381 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3382 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
|
3383 && ! NILP (elt) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3384 && load_force_doc_strings) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3385 doc_reference = 2; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3386 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3387 if (ch) |
341 | 3388 { |
3389 if (flag > 0) | |
3390 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3391 if (ch == ']') |
341 | 3392 return val; |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3393 invalid_syntax (") or . in a vector", 18); |
341 | 3394 } |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3395 if (ch == ')') |
341 | 3396 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
|
3397 if (ch == '.') |
341 | 3398 { |
3399 GCPRO2 (val, tail); | |
485 | 3400 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3401 XSETCDR (tail, read0 (readcharfun)); |
341 | 3402 else |
3403 val = read0 (readcharfun); | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3404 read1 (readcharfun, &ch, 0); |
341 | 3405 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
|
3406 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
|
3407 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3408 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
|
3409 return make_number (0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3410 if (doc_reference == 2) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3411 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3412 /* Get a doc string from the file we are loading. |
88886 | 3413 If it's in saved_doc_string, get it from there. |
3414 | |
3415 Here, we don't know if the string is a | |
3416 bytecode string or a doc string. As a | |
3417 bytecode string must be unibyte, we always | |
3418 return a unibyte string. If it is actually a | |
3419 doc string, caller must make it | |
3420 multibyte. */ | |
89483 | 3421 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3422 int pos = XINT (XCDR (val)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3423 /* Position is negative for user variables. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3424 if (pos < 0) pos = -pos; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3425 if (pos >= saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3426 && pos < (saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3427 + saved_doc_string_length)) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3428 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3429 int start = pos - saved_doc_string_position; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3430 int from, to; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3431 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3432 /* Process quoting with ^A, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3433 and find the end of the string, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3434 which is marked with ^_ (037). */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3435 for (from = start, to = start; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3436 saved_doc_string[from] != 037;) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3437 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3438 int c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3439 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3440 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3441 c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3442 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3443 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3444 else if (c == '0') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3445 saved_doc_string[to++] = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3446 else if (c == '_') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3447 saved_doc_string[to++] = 037; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3448 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3449 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3450 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3451 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3452 |
88886 | 3453 return make_unibyte_string (saved_doc_string + start, |
3454 to - start); | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3455 } |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3456 /* 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
|
3457 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
|
3458 && pos < (prev_saved_doc_string_position |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3459 + prev_saved_doc_string_length)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3460 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3461 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
|
3462 int from, to; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3463 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3464 /* Process quoting with ^A, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3465 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
|
3466 which is marked with ^_ (037). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3467 for (from = start, to = start; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3468 prev_saved_doc_string[from] != 037;) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3469 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3470 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
|
3471 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3472 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3473 c = prev_saved_doc_string[from++]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3474 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3475 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3476 else if (c == '0') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3477 prev_saved_doc_string[to++] = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3478 else if (c == '_') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3479 prev_saved_doc_string[to++] = 037; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3480 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3481 else |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3482 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3483 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3484 |
88886 | 3485 return make_unibyte_string (prev_saved_doc_string |
3486 + start, | |
3487 to - start); | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3488 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3489 else |
88886 | 3490 return get_doc_string (val, 1, 0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3491 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3492 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3493 return val; |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3494 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3495 invalid_syntax (". in wrong context", 18); |
341 | 3496 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3497 invalid_syntax ("] in a list", 11); |
341 | 3498 } |
3499 tem = (read_pure && flag <= 0 | |
3500 ? pure_cons (elt, Qnil) | |
3501 : Fcons (elt, Qnil)); | |
485 | 3502 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3503 XSETCDR (tail, tem); |
341 | 3504 else |
3505 val = tem; | |
3506 tail = tem; | |
3507 if (defunflag < 0) | |
3508 defunflag = EQ (elt, Qdefun); | |
3509 else if (defunflag > 0) | |
3510 read_pure = 1; | |
3511 } | |
3512 } | |
3513 | |
3514 Lisp_Object Vobarray; | |
3515 Lisp_Object initial_obarray; | |
3516 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3517 /* 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
|
3518 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3519 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
|
3520 |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3521 static int hash_string (const unsigned char *ptr, int len); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3522 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3523 /* 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
|
3524 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
|
3525 |
341 | 3526 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3527 check_obarray (Lisp_Object obarray) |
341 | 3528 { |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
3529 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3530 { |
3531 /* If Vobarray is now invalid, force it to be valid. */ | |
3532 if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
3533 wrong_type_argument (Qvectorp, obarray); |
341 | 3534 } |
3535 return obarray; | |
3536 } | |
3537 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3538 /* 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
|
3539 interned in the current obarray. */ |
341 | 3540 |
3541 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3542 intern (const char *str) |
341 | 3543 { |
3544 Lisp_Object tem; | |
3545 int len = strlen (str); | |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3546 Lisp_Object obarray; |
341 | 3547 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3548 obarray = Vobarray; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3549 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3550 obarray = check_obarray (obarray); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3551 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
|
3552 if (SYMBOLP (tem)) |
341 | 3553 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
|
3554 return Fintern (make_string (str, len), obarray); |
341 | 3555 } |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3556 |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3557 Lisp_Object |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3558 intern_c_string (const char *str) |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3559 { |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3560 Lisp_Object tem; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3561 int len = strlen (str); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3562 Lisp_Object obarray; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3563 |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3564 obarray = Vobarray; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3565 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3566 obarray = check_obarray (obarray); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3567 tem = oblookup (obarray, str, len, len); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3568 if (SYMBOLP (tem)) |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3569 return tem; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3570 |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3571 if (NILP (Vpurify_flag)) |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3572 /* Creating a non-pure string from a string literal not |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3573 implemented yet. We could just use make_string here and live |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3574 with the extra copy. */ |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3575 abort (); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3576 |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3577 return Fintern (make_pure_c_string (str), obarray); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3578 } |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3579 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3580 /* 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
|
3581 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3582 Lisp_Object |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3583 make_symbol (const char *str) |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3584 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3585 int len = strlen (str); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3586 |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3587 return Fmake_symbol (!NILP (Vpurify_flag) |
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3588 ? make_pure_string (str, len, len, 0) |
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3589 : make_string (str, len)); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3590 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3591 |
341 | 3592 DEFUN ("intern", Fintern, Sintern, 1, 2, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3593 doc: /* Return the canonical symbol whose name is STRING. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3594 If there is none, one is created by this function and returned. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3595 A second optional argument specifies the obarray to use; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3596 it defaults to the value of `obarray'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3597 (Lisp_Object string, Lisp_Object obarray) |
341 | 3598 { |
3599 register Lisp_Object tem, sym, *ptr; | |
3600 | |
485 | 3601 if (NILP (obarray)) obarray = Vobarray; |
341 | 3602 obarray = check_obarray (obarray); |
3603 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3604 CHECK_STRING (string); |
341 | 3605 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3606 tem = oblookup (obarray, SDATA (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3607 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3608 SBYTES (string)); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3609 if (!INTEGERP (tem)) |
341 | 3610 return tem; |
3611 | |
485 | 3612 if (!NILP (Vpurify_flag)) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3613 string = Fpurecopy (string); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3614 sym = Fmake_symbol (string); |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3615 |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3616 if (EQ (obarray, initial_obarray)) |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3617 XSYMBOL (sym)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3618 else |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3619 XSYMBOL (sym)->interned = SYMBOL_INTERNED; |
341 | 3620 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3621 if ((SREF (string, 0) == ':') |
21982
456f95c03285
(Fintern): Properly compare lisp objects.
Richard M. Stallman <rms@gnu.org>
parents:
21936
diff
changeset
|
3622 && EQ (obarray, initial_obarray)) |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3623 { |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3624 XSYMBOL (sym)->constant = 1; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3625 XSYMBOL (sym)->redirect = SYMBOL_PLAINVAL; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3626 SET_SYMBOL_VAL (XSYMBOL (sym), sym); |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3627 } |
17918
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
3628 |
341 | 3629 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
|
3630 if (SYMBOLP (*ptr)) |
341 | 3631 XSYMBOL (sym)->next = XSYMBOL (*ptr); |
3632 else | |
3633 XSYMBOL (sym)->next = 0; | |
3634 *ptr = sym; | |
3635 return sym; | |
3636 } | |
3637 | |
3638 DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3639 doc: /* Return the canonical symbol named NAME, or nil if none exists. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3640 NAME may be a string or a symbol. If it is a symbol, that exact |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3641 symbol is searched for. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3642 A second optional argument specifies the obarray to use; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3643 it defaults to the value of `obarray'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3644 (Lisp_Object name, Lisp_Object obarray) |
341 | 3645 { |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3646 register Lisp_Object tem, string; |
341 | 3647 |
485 | 3648 if (NILP (obarray)) obarray = Vobarray; |
341 | 3649 obarray = check_obarray (obarray); |
3650 | |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3651 if (!SYMBOLP (name)) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3652 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3653 CHECK_STRING (name); |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3654 string = name; |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3655 } |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3656 else |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3657 string = SYMBOL_NAME (name); |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3658 |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3659 tem = oblookup (obarray, SDATA (string), SCHARS (string), SBYTES (string)); |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3660 if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem))) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3661 return Qnil; |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3662 else |
341 | 3663 return tem; |
3664 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3665 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3666 DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3667 doc: /* Delete the symbol named NAME, if any, from OBARRAY. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3668 The value is t if a symbol was found and deleted, nil otherwise. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3669 NAME may be a string or a symbol. If it is a symbol, that symbol |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3670 is deleted, if it belongs to OBARRAY--no other symbol is deleted. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3671 OBARRAY defaults to the value of the variable `obarray'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3672 (Lisp_Object name, Lisp_Object obarray) |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3673 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3674 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
|
3675 int hash; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3676 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3677 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
|
3678 obarray = check_obarray (obarray); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3679 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3680 if (SYMBOLP (name)) |
45406
6f19e244af49
* lread.c (Fintern_soft, oblookup): Use SYMBOL_NAME and XSTRING
Ken Raeburn <raeburn@raeburn.org>
parents:
45001
diff
changeset
|
3681 string = SYMBOL_NAME (name); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3682 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3683 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3684 CHECK_STRING (name); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3685 string = name; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3686 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3687 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3688 tem = oblookup (obarray, SDATA (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3689 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3690 SBYTES (string)); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3691 if (INTEGERP (tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3692 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3693 /* 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
|
3694 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
|
3695 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3696 |
106133
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3697 /* There are plenty of other symbols which will screw up the Emacs |
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3698 session if we unintern them, as well as even more ways to use |
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3699 `setq' or `fset' or whatnot to make the Emacs session |
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3700 unusable. Let's not go down this silly road. --Stef */ |
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3701 /* if (EQ (tem, Qnil) || EQ (tem, Qt)) |
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3702 error ("Attempt to unintern t or nil"); */ |
106117
0fba14676688
* lread.c (Funintern): Error if symbol is t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
105942
diff
changeset
|
3703 |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3704 XSYMBOL (tem)->interned = SYMBOL_UNINTERNED; |
20773
6c655dc99321
(Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
3705 |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3706 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
|
3707 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3708 if (EQ (XVECTOR (obarray)->contents[hash], tem)) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3709 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3710 if (XSYMBOL (tem)->next) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3711 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3712 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3713 XSETINT (XVECTOR (obarray)->contents[hash], 0); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3714 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3715 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3716 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3717 Lisp_Object tail, following; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3718 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3719 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
|
3720 XSYMBOL (tail)->next; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3721 tail = following) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3722 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3723 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
|
3724 if (EQ (following, tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3725 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3726 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
|
3727 break; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3728 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3729 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3730 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3731 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3732 return Qt; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3733 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3734 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3735 /* 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
|
3736 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
|
3737 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
|
3738 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3739 Also store the bucket number in oblookup_last_bucket_number. */ |
341 | 3740 |
3741 Lisp_Object | |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
109726
diff
changeset
|
3742 oblookup (Lisp_Object obarray, register const char *ptr, EMACS_INT size, EMACS_INT size_byte) |
341 | 3743 { |
8828 | 3744 int hash; |
3745 int obsize; | |
341 | 3746 register Lisp_Object tail; |
3747 Lisp_Object bucket, tem; | |
3748 | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3749 if (!VECTORP (obarray) |
5243 | 3750 || (obsize = XVECTOR (obarray)->size) == 0) |
341 | 3751 { |
3752 obarray = check_obarray (obarray); | |
3753 obsize = XVECTOR (obarray)->size; | |
3754 } | |
13455
4f5a9ce67782
(oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
3755 /* 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
|
3756 obsize &= ~ARRAY_MARK_FLAG; |
97142 | 3757 hash = hash_string (ptr, size_byte) % obsize; |
341 | 3758 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
|
3759 oblookup_last_bucket_number = hash; |
58449
377948a6af9a
(oblookup): Don't use XFASTINT blindly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58093
diff
changeset
|
3760 if (EQ (bucket, make_number (0))) |
341 | 3761 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3762 else if (!SYMBOLP (bucket)) |
341 | 3763 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
|
3764 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3765 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next)) |
341 | 3766 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3767 if (SBYTES (SYMBOL_NAME (tail)) == size_byte |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3768 && SCHARS (SYMBOL_NAME (tail)) == size |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
3769 && !memcmp (SDATA (SYMBOL_NAME (tail)), ptr, size_byte)) |
341 | 3770 return tail; |
3771 else if (XSYMBOL (tail)->next == 0) | |
3772 break; | |
3773 } | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3774 XSETINT (tem, hash); |
341 | 3775 return tem; |
3776 } | |
3777 | |
3778 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3779 hash_string (const unsigned char *ptr, int len) |
341 | 3780 { |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3781 register const unsigned char *p = ptr; |
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3782 register const unsigned char *end = p + len; |
341 | 3783 register unsigned char c; |
3784 register int hash = 0; | |
3785 | |
3786 while (p != end) | |
3787 { | |
3788 c = *p++; | |
3789 if (c >= 0140) c -= 40; | |
3790 hash = ((hash<<3) + (hash>>28) + c); | |
3791 } | |
3792 return hash & 07777777777; | |
3793 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3794 |
341 | 3795 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3796 map_obarray (Lisp_Object obarray, void (*fn) (Lisp_Object, Lisp_Object), Lisp_Object arg) |
341 | 3797 { |
3798 register int i; | |
3799 register Lisp_Object tail; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3800 CHECK_VECTOR (obarray); |
341 | 3801 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--) |
3802 { | |
3803 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
|
3804 if (SYMBOLP (tail)) |
341 | 3805 while (1) |
3806 { | |
3807 (*fn) (tail, arg); | |
3808 if (XSYMBOL (tail)->next == 0) | |
3809 break; | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3810 XSETSYMBOL (tail, XSYMBOL (tail)->next); |
341 | 3811 } |
3812 } | |
3813 } | |
3814 | |
109542
6b02202d9fdc
* lread.c (unreadpure, mapatoms_1): Make static.
Juanma Barranquero <lekktu@gmail.com>
parents:
109364
diff
changeset
|
3815 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3816 mapatoms_1 (Lisp_Object sym, Lisp_Object function) |
341 | 3817 { |
3818 call1 (function, sym); | |
3819 } | |
3820 | |
3821 DEFUN ("mapatoms", Fmapatoms, Smapatoms, 1, 2, 0, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3822 doc: /* Call FUNCTION on every symbol in OBARRAY. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3823 OBARRAY defaults to the value of `obarray'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3824 (Lisp_Object function, Lisp_Object obarray) |
341 | 3825 { |
485 | 3826 if (NILP (obarray)) obarray = Vobarray; |
341 | 3827 obarray = check_obarray (obarray); |
3828 | |
3829 map_obarray (obarray, mapatoms_1, function); | |
3830 return Qnil; | |
3831 } | |
3832 | |
5117
951396781a0e
(OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents:
5017
diff
changeset
|
3833 #define OBARRAY_SIZE 1511 |
341 | 3834 |
3835 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3836 init_obarray (void) |
341 | 3837 { |
3838 Lisp_Object oblength; | |
3839 | |
9313
ed68c3822e4b
(read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9274
diff
changeset
|
3840 XSETFASTINT (oblength, OBARRAY_SIZE); |
341 | 3841 |
3842 Vobarray = Fmake_vector (oblength, make_number (0)); | |
3843 initial_obarray = Vobarray; | |
3844 staticpro (&initial_obarray); | |
3845 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3846 Qunbound = Fmake_symbol (make_pure_c_string ("unbound")); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3847 /* Set temporary dummy values to Qnil and Vpurify_flag to satisfy the |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3848 NILP (Vpurify_flag) check in intern_c_string. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3849 Qnil = make_number (-1); Vpurify_flag = make_number (1); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3850 Qnil = intern_c_string ("nil"); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3851 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3852 /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3853 so those two need to be fixed manally. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3854 SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound); |
341 | 3855 XSYMBOL (Qunbound)->function = Qunbound; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3856 XSYMBOL (Qunbound)->plist = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3857 /* XSYMBOL (Qnil)->function = Qunbound; */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3858 SET_SYMBOL_VAL (XSYMBOL (Qnil), Qnil); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3859 XSYMBOL (Qnil)->constant = 1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3860 XSYMBOL (Qnil)->plist = Qnil; |
341 | 3861 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3862 Qt = intern_c_string ("t"); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3863 SET_SYMBOL_VAL (XSYMBOL (Qt), Qt); |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3864 XSYMBOL (Qt)->constant = 1; |
341 | 3865 |
3866 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */ | |
3867 Vpurify_flag = Qt; | |
3868 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3869 Qvariable_documentation = intern_c_string ("variable-documentation"); |
16228
fa7a56c543df
(init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents:
16165
diff
changeset
|
3870 staticpro (&Qvariable_documentation); |
341 | 3871 |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
3872 read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH; |
27852
98f55bbdbbad
(Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents:
27763
diff
changeset
|
3873 read_buffer = (char *) xmalloc (read_buffer_size); |
341 | 3874 } |
3875 | |
3876 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3877 defsubr (struct Lisp_Subr *sname) |
341 | 3878 { |
3879 Lisp_Object sym; | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3880 sym = intern_c_string (sname->symbol_name); |
85015
695c195058e7
(defsubr): Use XSETPVECTYPE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85011
diff
changeset
|
3881 XSETPVECTYPE (sname, PVEC_SUBR); |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3882 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3883 } |
3884 | |
3885 #ifdef NOTDEF /* use fset in subr.el now */ | |
3886 void | |
3887 defalias (sname, string) | |
3888 struct Lisp_Subr *sname; | |
3889 char *string; | |
3890 { | |
3891 Lisp_Object sym; | |
3892 sym = intern (string); | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3893 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3894 } |
3895 #endif /* NOTDEF */ | |
3896 | |
3897 /* Define an "integer variable"; a symbol whose value is forwarded | |
85127
b98ea218eb70
Fix comment; indent-tabs-mode was a bad example,
Juanma Barranquero <lekktu@gmail.com>
parents:
85015
diff
changeset
|
3898 to a C variable of type int. Sample call: |
b98ea218eb70
Fix comment; indent-tabs-mode was a bad example,
Juanma Barranquero <lekktu@gmail.com>
parents:
85015
diff
changeset
|
3899 DEFVAR_INT ("emacs-priority", &emacs_priority, "Documentation"); */ |
341 | 3900 void |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3901 defvar_int (struct Lisp_Intfwd *i_fwd, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3902 const char *namestring, EMACS_INT *address) |
341 | 3903 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3904 Lisp_Object sym; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3905 sym = intern_c_string (namestring); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3906 i_fwd->type = Lisp_Fwd_Int; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3907 i_fwd->intvar = address; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3908 XSYMBOL (sym)->redirect = SYMBOL_FORWARDED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3909 SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)i_fwd); |
341 | 3910 } |
3911 | |
42206 | 3912 /* Similar but define a variable whose value is t if address contains 1, |
85127
b98ea218eb70
Fix comment; indent-tabs-mode was a bad example,
Juanma Barranquero <lekktu@gmail.com>
parents:
85015
diff
changeset
|
3913 nil if address contains 0. */ |
341 | 3914 void |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3915 defvar_bool (struct Lisp_Boolfwd *b_fwd, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3916 const char *namestring, int *address) |
341 | 3917 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3918 Lisp_Object sym; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3919 sym = intern_c_string (namestring); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3920 b_fwd->type = Lisp_Fwd_Bool; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3921 b_fwd->boolvar = address; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3922 XSYMBOL (sym)->redirect = SYMBOL_FORWARDED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3923 SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)b_fwd); |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
3924 Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars); |
341 | 3925 } |
3926 | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3927 /* 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
|
3928 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
|
3929 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
|
3930 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
|
3931 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
|
3932 void |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3933 defvar_lisp_nopro (struct Lisp_Objfwd *o_fwd, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3934 const char *namestring, Lisp_Object *address) |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3935 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3936 Lisp_Object sym; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3937 sym = intern_c_string (namestring); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3938 o_fwd->type = Lisp_Fwd_Obj; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3939 o_fwd->objvar = address; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3940 XSYMBOL (sym)->redirect = SYMBOL_FORWARDED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3941 SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)o_fwd); |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3942 } |
341 | 3943 |
3944 void | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3945 defvar_lisp (struct Lisp_Objfwd *o_fwd, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3946 const char *namestring, Lisp_Object *address) |
341 | 3947 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3948 defvar_lisp_nopro (o_fwd, namestring, address); |
341 | 3949 staticpro (address); |
3950 } | |
3951 | |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3952 /* 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
|
3953 at a particular offset in the current kboard object. */ |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3954 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3955 void |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3956 defvar_kboard (struct Lisp_Kboard_Objfwd *ko_fwd, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3957 const char *namestring, int offset) |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3958 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3959 Lisp_Object sym; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3960 sym = intern_c_string (namestring); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3961 ko_fwd->type = Lisp_Fwd_Kboard_Obj; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3962 ko_fwd->offset = offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3963 XSYMBOL (sym)->redirect = SYMBOL_FORWARDED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107737
diff
changeset
|
3964 SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)ko_fwd); |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
3965 } |
341 | 3966 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3967 /* 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
|
3968 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
|
3969 static Lisp_Object dump_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
3970 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3971 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3972 init_lread (void) |
341 | 3973 { |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109637
diff
changeset
|
3974 const char *normal; |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3975 int turn_off_warning = 0; |
341 | 3976 |
364 | 3977 /* Compute the default load-path. */ |
617 | 3978 #ifdef CANNOT_DUMP |
3979 normal = PATH_LOADSEARCH; | |
638 | 3980 Vload_path = decode_env_path (0, normal); |
617 | 3981 #else |
3982 if (NILP (Vpurify_flag)) | |
3983 normal = PATH_LOADSEARCH; | |
3984 else | |
3985 normal = PATH_DUMPLOADSEARCH; | |
3986 | |
3987 /* In a dumped Emacs, we normally have to reset the value of | |
3988 Vload_path from PATH_LOADSEARCH, since the value that was dumped | |
3989 uses ../lisp, instead of the path of the installed elisp | |
3990 libraries. However, if it appears that Vload_path was changed | |
3991 from the default before dumping, don't override that value. */ | |
621 | 3992 if (initialized) |
3993 { | |
3994 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
|
3995 { |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3996 Vload_path = decode_env_path (0, normal); |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
3997 if (!NILP (Vinstallation_directory)) |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
3998 { |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
3999 Lisp_Object tem, tem1, sitelisp; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4000 |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4001 /* Remove site-lisp dirs from path temporarily and store |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4002 them in sitelisp, then conc them on at the end so |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4003 they're always first in path. */ |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4004 sitelisp = Qnil; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4005 while (1) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4006 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4007 tem = Fcar (Vload_path); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4008 tem1 = Fstring_match (build_string ("site-lisp"), |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4009 tem, Qnil); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4010 if (!NILP (tem1)) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4011 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4012 Vload_path = Fcdr (Vload_path); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4013 sitelisp = Fcons (tem, sitelisp); |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4014 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4015 else |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4016 break; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4017 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4018 |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4019 /* 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
|
4020 installation dir, if it exists. */ |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4021 tem = Fexpand_file_name (build_string ("lisp"), |
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4022 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
|
4023 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
|
4024 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
|
4025 { |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4026 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
|
4027 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4028 turn_off_warning = 1; |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4029 Vload_path = Fcons (tem, Vload_path); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4030 } |
7004
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4031 } |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4032 else |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4033 /* 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
|
4034 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
|
4035 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
|
4036 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4037 /* 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
|
4038 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
|
4039 Vinstallation_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4040 tem1 = Ffile_exists_p (tem); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4041 if (!NILP (tem1)) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4042 { |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4043 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4044 Vload_path = Fcons (tem, Vload_path); |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4045 } |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4046 |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
4047 /* Add site-lisp under the installation dir, if it exists. */ |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4048 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
|
4049 Vinstallation_directory); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4050 tem1 = Ffile_exists_p (tem); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4051 if (!NILP (tem1)) |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4052 { |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4053 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4054 Vload_path = Fcons (tem, Vload_path); |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4055 } |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4056 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4057 /* 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
|
4058 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
|
4059 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
|
4060 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4061 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
|
4062 { |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4063 Lisp_Object tem2; |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4064 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4065 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
|
4066 Vinstallation_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4067 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
|
4068 |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4069 /* 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
|
4070 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
|
4071 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
|
4072 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
|
4073 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
|
4074 Vinstallation_directory); |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4075 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
|
4076 if (!NILP (tem1) && NILP (tem2)) |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4077 { |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4078 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
|
4079 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4080 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4081 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4082 Vload_path = Fcons (tem, Vload_path); |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4083 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4084 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
|
4085 Vsource_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4086 |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4087 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4088 Vload_path = Fcons (tem, Vload_path); |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4089 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4090 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
|
4091 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4092 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4093 if (NILP (Fmember (tem, Vload_path))) |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4094 Vload_path = Fcons (tem, Vload_path); |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4095 } |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4096 } |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4097 if (!NILP (sitelisp)) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4098 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path); |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
4099 } |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
4100 } |
621 | 4101 } |
4102 else | |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4103 { |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
4104 /* 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
|
4105 /* 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
|
4106 that caused trouble because it was copied from dump_path |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
4107 into Vload_path, above, when Vinstallation_directory was non-nil. |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
4108 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
|
4109 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
|
4110 dump_path = Vload_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4111 } |
364 | 4112 #endif |
4113 | |
104853 | 4114 #if (!(defined (WINDOWSNT) || (defined (HAVE_NS)))) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4115 /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4116 almost never correct, thereby causing a warning to be printed out that |
14036 | 4117 confuses users. Since PATH_LOADSEARCH is always overridden by the |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
4118 EMACSLOADPATH environment variable below, disable the warning on NT. */ |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
4119 |
341 | 4120 /* 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
|
4121 if (!turn_off_warning) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4122 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4123 Lisp_Object path_tail; |
341 | 4124 |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4125 for (path_tail = Vload_path; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4126 !NILP (path_tail); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
4127 path_tail = XCDR (path_tail)) |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4128 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4129 Lisp_Object dirfile; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4130 dirfile = Fcar (path_tail); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4131 if (STRINGP (dirfile)) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4132 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4133 dirfile = Fdirectory_file_name (dirfile); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4134 if (access (SDATA (dirfile), 0) < 0) |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4135 dir_warning ("Warning: Lisp directory `%s' does not exist.\n", |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
4136 XCAR (path_tail)); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4137 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4138 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4139 } |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
4140 #endif /* !(WINDOWSNT || HAVE_NS) */ |
617 | 4141 |
4142 /* If the EMACSLOADPATH environment variable is set, use its value. | |
4143 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
|
4144 #ifndef CANNOT_DUMP |
617 | 4145 if (NILP (Vpurify_flag) |
4146 && egetenv ("EMACSLOADPATH")) | |
11955
d972c95e7577
(init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11868
diff
changeset
|
4147 #endif |
364 | 4148 Vload_path = decode_env_path ("EMACSLOADPATH", normal); |
4149 | |
4150 Vvalues = Qnil; | |
4151 | |
341 | 4152 load_in_progress = 0; |
15283
b2be450a8da4
(init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
15091
diff
changeset
|
4153 Vload_file_name = Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4154 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4155 load_descriptor_list = Qnil; |
21291
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4156 |
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4157 Vstandard_input = Qt; |
31536
76cf765a7dad
(init_lread): Set Vloads_in_progress to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
31534
diff
changeset
|
4158 Vloads_in_progress = Qnil; |
341 | 4159 } |
4160 | |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4161 /* Print a warning, using format string FORMAT, that directory DIRNAME |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
4162 does not exist. Print it on stderr and put it in *Messages*. */ |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4163 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
4164 void |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
4165 dir_warning (const char *format, Lisp_Object dirname) |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4166 { |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4167 char *buffer |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4168 = (char *) alloca (SCHARS (dirname) + strlen (format) + 5); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4169 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4170 fprintf (stderr, format, SDATA (dirname)); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4171 sprintf (buffer, format, SDATA (dirname)); |
21736
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
4172 /* 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
|
4173 if (initialized) |
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
4174 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
|
4175 } |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4176 |
341 | 4177 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4178 syms_of_lread (void) |
341 | 4179 { |
4180 defsubr (&Sread); | |
4181 defsubr (&Sread_from_string); | |
4182 defsubr (&Sintern); | |
4183 defsubr (&Sintern_soft); | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
4184 defsubr (&Sunintern); |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4185 defsubr (&Sget_load_suffixes); |
341 | 4186 defsubr (&Sload); |
672 | 4187 defsubr (&Seval_buffer); |
341 | 4188 defsubr (&Seval_region); |
4189 defsubr (&Sread_char); | |
4190 defsubr (&Sread_char_exclusive); | |
4191 defsubr (&Sread_event); | |
4192 defsubr (&Sget_file_char); | |
4193 defsubr (&Smapatoms); | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
4194 defsubr (&Slocate_file_internal); |
341 | 4195 |
4196 DEFVAR_LISP ("obarray", &Vobarray, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4197 doc: /* Symbol table for use by `intern' and `read'. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4198 It is a vector whose length ought to be prime for best results. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4199 The vector's contents don't make sense if examined from Lisp programs; |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4200 to find all the symbols in an obarray, use `mapatoms'. */); |
341 | 4201 |
4202 DEFVAR_LISP ("values", &Vvalues, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4203 doc: /* List of values of all expressions which were read, evaluated and printed. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4204 Order is reverse chronological. */); |
341 | 4205 |
4206 DEFVAR_LISP ("standard-input", &Vstandard_input, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4207 doc: /* Stream for read to get input from. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4208 See documentation of `read' for possible values. */); |
341 | 4209 Vstandard_input = Qt; |
4210 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4211 DEFVAR_LISP ("read-with-symbol-positions", &Vread_with_symbol_positions, |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4212 doc: /* If non-nil, add position of read symbols to `read-symbol-positions-list'. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4213 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4214 If this variable is a buffer, then only forms read from that buffer |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4215 will be added to `read-symbol-positions-list'. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4216 If this variable is t, then all read forms will be added. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4217 The effect of all other values other than nil are not currently |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4218 defined, although they may be in the future. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4219 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4220 The positions are relative to the last call to `read' or |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4221 `read-from-string'. It is probably a bad idea to set this variable at |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4222 the toplevel; bind it instead. */); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4223 Vread_with_symbol_positions = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4224 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4225 DEFVAR_LISP ("read-symbol-positions-list", &Vread_symbol_positions_list, |
47919
b85eeb858fb1
(syms_of_lread): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
47847
diff
changeset
|
4226 doc: /* A list mapping read symbols to their positions. |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4227 This variable is modified during calls to `read' or |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4228 `read-from-string', but only when `read-with-symbol-positions' is |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4229 non-nil. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4230 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4231 Each element of the list looks like (SYMBOL . CHAR-POSITION), where |
47919
b85eeb858fb1
(syms_of_lread): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
47847
diff
changeset
|
4232 CHAR-POSITION is an integer giving the offset of that occurrence of the |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4233 symbol from the position where `read' or `read-from-string' started. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4234 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4235 Note that a symbol will appear multiple times in this list, if it was |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4236 read multiple times. The list is in the same order as the symbols |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4237 were read in. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4238 Vread_symbol_positions_list = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4239 |
103101
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
4240 DEFVAR_LISP ("read-circle", &Vread_circle, |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
4241 doc: /* Non-nil means read recursive structures using #N= and #N# syntax. */); |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
4242 Vread_circle = Qt; |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
4243 |
341 | 4244 DEFVAR_LISP ("load-path", &Vload_path, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4245 doc: /* *List of directories to search for files to load. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4246 Each element is a string (directory name) or nil (try default directory). |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4247 Initialized based on EMACSLOADPATH environment variable, if any, |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4248 otherwise to default specified by file `epaths.h' when Emacs was built. */); |
341 | 4249 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4250 DEFVAR_LISP ("load-suffixes", &Vload_suffixes, |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4251 doc: /* List of suffixes for (compiled or source) Emacs Lisp files. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4252 This list should not include the empty string. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4253 `load' and related functions try to append these suffixes, in order, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4254 to the specified file name if a Lisp suffix is allowed or required. */); |
105942
5fc80e6b5b7c
* xfns.c (syms_of_xfns): Use make_pure_string instead of build_string.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
4255 Vload_suffixes = Fcons (make_pure_c_string (".elc"), |
5fc80e6b5b7c
* xfns.c (syms_of_xfns): Use make_pure_string instead of build_string.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
4256 Fcons (make_pure_c_string (".el"), Qnil)); |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4257 DEFVAR_LISP ("load-file-rep-suffixes", &Vload_file_rep_suffixes, |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4258 doc: /* List of suffixes that indicate representations of \ |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4259 the same file. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4260 This list should normally start with the empty string. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4261 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4262 Enabling Auto Compression mode appends the suffixes in |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4263 `jka-compr-load-suffixes' to this list and disabling Auto Compression |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4264 mode removes them again. `load' and related functions use this list to |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4265 determine whether they should look for compressed versions of a file |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4266 and, if so, which suffixes they should try to append to the file name |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4267 in order to do so. However, if you want to customize which suffixes |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4268 the loading functions recognize as compression suffixes, you should |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4269 customize `jka-compr-load-suffixes' rather than the present variable. */); |
81270
0bf4e298d593
(syms_of_lread, openp): Use empty_unibyte_string, not build_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
80808
diff
changeset
|
4270 Vload_file_rep_suffixes = Fcons (empty_unibyte_string, Qnil); |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4271 |
341 | 4272 DEFVAR_BOOL ("load-in-progress", &load_in_progress, |
78501 | 4273 doc: /* Non-nil if inside of `load'. */); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4274 Qload_in_progress = intern_c_string ("load-in-progress"); |
104059
3750eeb20ab9
* lread.c: Rewrite 2009-07-21 changes.
Ken Raeburn <raeburn@raeburn.org>
parents:
104006
diff
changeset
|
4275 staticpro (&Qload_in_progress); |
341 | 4276 |
4277 DEFVAR_LISP ("after-load-alist", &Vafter_load_alist, | |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4278 doc: /* An alist of expressions to be evalled when particular files are loaded. |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4279 Each element looks like (REGEXP-OR-FEATURE FORMS...). |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4280 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4281 REGEXP-OR-FEATURE is either a regular expression to match file names, or |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4282 a symbol \(a feature name). |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4283 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4284 When `load' is run and the file-name argument matches an element's |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4285 REGEXP-OR-FEATURE, or when `provide' is run and provides the symbol |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4286 REGEXP-OR-FEATURE, the FORMS in the element are executed. |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4287 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4288 An error in FORMS does not undo the load, but does prevent execution of |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4289 the rest of the FORMS. */); |
341 | 4290 Vafter_load_alist = Qnil; |
4291 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
4292 DEFVAR_LISP ("load-history", &Vload_history, |
106689
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4293 doc: /* Alist mapping loaded file names to symbols and features. |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4294 Each alist element should be a list (FILE-NAME ENTRIES...), where |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4295 FILE-NAME is the name of a file that has been loaded into Emacs. |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4296 The file name is absolute and true (i.e. it doesn't contain symlinks). |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4297 As an exception, one of the alist elements may have FILE-NAME nil, |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4298 for symbols and features not associated with any file. |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4299 |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4300 The remaining ENTRIES in the alist element describe the functions and |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4301 variables defined in that file, the features provided, and the |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4302 features required. Each entry has the form `(provide . FEATURE)', |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4303 `(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)', |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4304 `(defface . SYMBOL)', or `(t . SYMBOL)'. In addition, an entry `(t |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4305 . SYMBOL)' may precede an entry `(defun . FUNCTION)', and means that |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4306 SYMBOL was an autoload before this file redefined it as a function. |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
4307 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
4308 During preloading, the file name recorded is relative to the main Lisp |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
4309 directory. These file names are converted to absolute at startup. */); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
4310 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
|
4311 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4312 DEFVAR_LISP ("load-file-name", &Vload_file_name, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4313 doc: /* Full name of file being loaded by `load'. */); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4314 Vload_file_name = Qnil; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4315 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4316 DEFVAR_LISP ("user-init-file", &Vuser_init_file, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4317 doc: /* File name, including directory, of user's initialization file. |
60069
edecd7c1824e
(syms_of_lread) <user-init-file>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59108
diff
changeset
|
4318 If the file loaded had extension `.elc', and the corresponding source file |
edecd7c1824e
(syms_of_lread) <user-init-file>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59108
diff
changeset
|
4319 exists, this variable contains the name of source file, suitable for use |
75594
8c74b56c521b
(syms_of_lread) <user-init-file>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4320 by functions like `custom-save-all' which edit the init file. |
8c74b56c521b
(syms_of_lread) <user-init-file>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4321 While Emacs loads and evaluates the init file, value is the real name |
8c74b56c521b
(syms_of_lread) <user-init-file>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4322 of the file, regardless of whether or not it has the `.elc' extension. */); |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4323 Vuser_init_file = Qnil; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4324 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
4325 DEFVAR_LISP ("current-load-list", &Vcurrent_load_list, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4326 doc: /* Used for internal purposes by `load'. */); |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
4327 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
|
4328 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4329 DEFVAR_LISP ("load-read-function", &Vload_read_function, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4330 doc: /* Function used by `load' and `eval-region' for reading expressions. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4331 The default is nil, which means use the function `read'. */); |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4332 Vload_read_function = Qnil; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4333 |
17038 | 4334 DEFVAR_LISP ("load-source-file-function", &Vload_source_file_function, |
73800
4d1706442c96
(syms_of_lread): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
72132
diff
changeset
|
4335 doc: /* Function called in `load' for loading an Emacs Lisp source file. |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4336 This function is for doing code conversion before reading the source file. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4337 If nil, loading is done without any code conversion. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4338 Arguments are FULLNAME, FILE, NOERROR, NOMESSAGE, where |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4339 FULLNAME is the full name of FILE. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4340 See `load' for the meaning of the remaining arguments. */); |
17038 | 4341 Vload_source_file_function = Qnil; |
4342 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4343 DEFVAR_BOOL ("load-force-doc-strings", &load_force_doc_strings, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4344 doc: /* Non-nil means `load' should force-load all dynamic doc strings. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4345 This is useful when the file being loaded is a temporary copy. */); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4346 load_force_doc_strings = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4347 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4348 DEFVAR_BOOL ("load-convert-to-unibyte", &load_convert_to_unibyte, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4349 doc: /* Non-nil means `read' converts strings to unibyte whenever possible. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4350 This is normally bound by `load' and `eval-buffer' to control `read', |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4351 and is not meant for users to change. */); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4352 load_convert_to_unibyte = 0; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4353 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
4354 DEFVAR_LISP ("source-directory", &Vsource_directory, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4355 doc: /* Directory in which Emacs sources were found when Emacs was built. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4356 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
|
4357 Vsource_directory |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4358 = Fexpand_file_name (build_string ("../"), |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4359 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH))); |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4360 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4361 DEFVAR_LISP ("preloaded-file-list", &Vpreloaded_file_list, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4362 doc: /* List of files that were preloaded (when dumping Emacs). */); |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4363 Vpreloaded_file_list = Qnil; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4364 |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4365 DEFVAR_LISP ("byte-boolean-vars", &Vbyte_boolean_vars, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4366 doc: /* List of all DEFVAR_BOOL variables, used by the byte code optimizer. */); |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4367 Vbyte_boolean_vars = Qnil; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4368 |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4369 DEFVAR_BOOL ("load-dangerous-libraries", &load_dangerous_libraries, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4370 doc: /* Non-nil means load dangerous compiled Lisp files. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4371 Some versions of XEmacs use different byte codes than Emacs. These |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4372 incompatible byte codes can make Emacs crash when it tries to execute |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4373 them. */); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4374 load_dangerous_libraries = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4375 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
4376 DEFVAR_BOOL ("force-load-messages", &force_load_messages, |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
4377 doc: /* Non-nil means force printing messages when loading Lisp files. |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
4378 This overrides the value of the NOMESSAGE argument to `load'. */); |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
4379 force_load_messages = 0; |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
4380 |
31367
22eb2b661cdf
(syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents:
31315
diff
changeset
|
4381 DEFVAR_LISP ("bytecomp-version-regexp", &Vbytecomp_version_regexp, |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4382 doc: /* Regular expression matching safe to load compiled Lisp files. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4383 When Emacs loads a compiled Lisp file, it reads the first 512 bytes |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4384 from the file, and matches them against this regular expression. |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4385 When the regular expression matches, the file is considered to be safe |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
4386 to load. See also `load-dangerous-libraries'. */); |
31367
22eb2b661cdf
(syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents:
31315
diff
changeset
|
4387 Vbytecomp_version_regexp |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4388 = make_pure_c_string ("^;;;.\\(in Emacs version\\|bytecomp version FSF\\)"); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4389 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4390 DEFVAR_LISP ("eval-buffer-list", &Veval_buffer_list, |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4391 doc: /* List of buffers being read from by calls to `eval-buffer' and `eval-region'. */); |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4392 Veval_buffer_list = Qnil; |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4393 |
78614
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4394 DEFVAR_LISP ("old-style-backquotes", &Vold_style_backquotes, |
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4395 doc: /* Set to non-nil when `read' encounters an old-style backquote. */); |
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4396 Vold_style_backquotes = Qnil; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4397 Qold_style_backquotes = intern_c_string ("old-style-backquotes"); |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
4398 staticpro (&Qold_style_backquotes); |
78614
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4399 |
14300
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4400 /* Vsource_directory was initialized in init_lread. */ |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4401 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4402 load_descriptor_list = Qnil; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4403 staticpro (&load_descriptor_list); |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4404 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4405 Qcurrent_load_list = intern_c_string ("current-load-list"); |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
4406 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
|
4407 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4408 Qstandard_input = intern_c_string ("standard-input"); |
341 | 4409 staticpro (&Qstandard_input); |
4410 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4411 Qread_char = intern_c_string ("read-char"); |
341 | 4412 staticpro (&Qread_char); |
4413 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4414 Qget_file_char = intern_c_string ("get-file-char"); |
341 | 4415 staticpro (&Qget_file_char); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4416 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4417 Qget_emacs_mule_file_char = intern_c_string ("get-emacs-mule-file-char"); |
88886 | 4418 staticpro (&Qget_emacs_mule_file_char); |
4419 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4420 Qload_force_doc_strings = intern_c_string ("load-force-doc-strings"); |
88886 | 4421 staticpro (&Qload_force_doc_strings); |
4422 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4423 Qbackquote = intern_c_string ("`"); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4424 staticpro (&Qbackquote); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4425 Qcomma = intern_c_string (","); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4426 staticpro (&Qcomma); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4427 Qcomma_at = intern_c_string (",@"); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4428 staticpro (&Qcomma_at); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4429 Qcomma_dot = intern_c_string (",."); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4430 staticpro (&Qcomma_dot); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4431 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4432 Qinhibit_file_name_operation = intern_c_string ("inhibit-file-name-operation"); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
4433 staticpro (&Qinhibit_file_name_operation); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
4434 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4435 Qascii_character = intern_c_string ("ascii-character"); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4436 staticpro (&Qascii_character); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4437 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4438 Qfunction = intern_c_string ("function"); |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4439 staticpro (&Qfunction); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4440 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4441 Qload = intern_c_string ("load"); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4442 staticpro (&Qload); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4443 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4444 Qload_file_name = intern_c_string ("load-file-name"); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4445 staticpro (&Qload_file_name); |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4446 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4447 Qeval_buffer_list = intern_c_string ("eval-buffer-list"); |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4448 staticpro (&Qeval_buffer_list); |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4449 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4450 Qfile_truename = intern_c_string ("file-truename"); |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4451 staticpro (&Qfile_truename) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4452 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4453 Qdo_after_load_evaluation = intern_c_string ("do-after-load-evaluation"); |
70880
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4454 staticpro (&Qdo_after_load_evaluation) ; |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4455 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4456 staticpro (&dump_path); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4457 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4458 staticpro (&read_objects); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4459 read_objects = Qnil; |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
4460 staticpro (&seen_list); |
64317
f69dd5d2d72d
(syms_of_lread): Initialize seen_list.
Kim F. Storm <storm@cua.dk>
parents:
64205
diff
changeset
|
4461 seen_list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4462 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4463 Vloads_in_progress = Qnil; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4464 staticpro (&Vloads_in_progress); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4465 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4466 Qhash_table = intern_c_string ("hash-table"); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4467 staticpro (&Qhash_table); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4468 Qdata = intern_c_string ("data"); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4469 staticpro (&Qdata); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4470 Qtest = intern_c_string ("test"); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4471 staticpro (&Qtest); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4472 Qsize = intern_c_string ("size"); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4473 staticpro (&Qsize); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4474 Qweakness = intern_c_string ("weakness"); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4475 staticpro (&Qweakness); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4476 Qrehash_size = intern_c_string ("rehash-size"); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4477 staticpro (&Qrehash_size); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4478 Qrehash_threshold = intern_c_string ("rehash-threshold"); |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
4479 staticpro (&Qrehash_threshold); |
341 | 4480 } |
52401 | 4481 |
4482 /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d | |
4483 (do not change this comment) */ |