Mercurial > emacs
annotate src/lread.c @ 109275:a85c2c80290c
Clarify command loop's role in undo boundary (Bug#2433).
* text.texi (Undo): Clarify command loop behavior (Bug#2433).
* commands.texi (Command Overview): Mention undo-boundary call.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 24 Jun 2010 15:05:47 -0400 |
parents | de58fd0baac5 |
children | 60516122d066 2f23047ca654 913b779aa4ee |
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 #if __DJGPP__ < 2 |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
45 #include <unistd.h> /* to get X_OK */ |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
46 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
47 #include "msdos.h" |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
48 #endif |
a6889b33d21c
[MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents:
14950
diff
changeset
|
49 |
21799 | 50 #ifdef HAVE_UNISTD_H |
51 #include <unistd.h> | |
52 #endif | |
53 | |
341 | 54 #ifndef X_OK |
55 #define X_OK 01 | |
56 #endif | |
57 | |
58 #include <math.h> | |
59 | |
14950 | 60 #ifdef HAVE_SETLOCALE |
61 #include <locale.h> | |
62 #endif /* HAVE_SETLOCALE */ | |
63 | |
51398 | 64 #ifdef HAVE_FCNTL_H |
65 #include <fcntl.h> | |
66 #endif | |
8596 | 67 #ifndef O_RDONLY |
68 #define O_RDONLY 0 | |
69 #endif | |
70 | |
34428
b2ec0cbfd60a
(file_offset, file_tell): Depend on HAVE_FSEEKO, not
Gerd Moellmann <gerd@gnu.org>
parents:
34362
diff
changeset
|
71 #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
|
72 #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
|
73 #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
|
74 #else |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
75 #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
|
76 #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
|
77 #endif |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
78 |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
79 #ifndef USE_CRT_DLL |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
80 extern int errno; |
31100
92f108b8b281
[USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents:
30985
diff
changeset
|
81 #endif |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
82 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
83 /* 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
|
84 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
|
85 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
|
86 Lisp_Object Qweakness; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
87 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
|
88 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
|
89 extern Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
90 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
91 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; |
341 | 92 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
|
93 Lisp_Object Qascii_character, Qload, Qload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
94 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
|
95 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
|
96 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
|
97 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
|
98 |
88886 | 99 /* Used instead of Qget_file_char while loading *.elc files compiled |
100 by Emacs 21 or older. */ | |
101 static Lisp_Object Qget_emacs_mule_file_char; | |
102 | |
103 static Lisp_Object Qload_force_doc_strings; | |
104 | |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
105 extern Lisp_Object Qevent_symbol_element_mask; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
106 extern Lisp_Object Qfile_exists_p; |
341 | 107 |
78501 | 108 /* non-zero if inside `load' */ |
341 | 109 int load_in_progress; |
104059
3750eeb20ab9
* lread.c: Rewrite 2009-07-21 changes.
Ken Raeburn <raeburn@raeburn.org>
parents:
104006
diff
changeset
|
110 static Lisp_Object Qload_in_progress; |
104006
b426d08d0ba3
(load_depth): New variable.
Ken Raeburn <raeburn@raeburn.org>
parents:
103101
diff
changeset
|
111 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
112 /* Directory in which the sources were found. */ |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
113 Lisp_Object Vsource_directory; |
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
114 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
115 /* 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
|
116 Lisp_Object Vload_path, Vload_suffixes, Vload_file_rep_suffixes; |
341 | 117 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
118 /* File name of user's init file. */ |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
119 Lisp_Object Vuser_init_file; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
120 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
121 /* 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
|
122 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
|
123 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
|
124 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
125 /* 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
|
126 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
|
127 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
128 /* List of files that were preloaded. */ |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
129 Lisp_Object Vpreloaded_file_list; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
130 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
131 /* 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
|
132 Lisp_Object Vload_file_name; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
133 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
134 /* 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
|
135 Lisp_Object Vload_read_function; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
136 |
103101
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
137 /* 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
|
138 Lisp_Object Vread_circle; |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
139 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
140 /* 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
|
141 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
|
142 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
|
143 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
|
144 Lisp_Object read_objects; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
145 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
146 /* 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
|
147 static int load_force_doc_strings; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
148 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
149 /* 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
|
150 static int load_convert_to_unibyte; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
151 |
88886 | 152 /* Nonzero means READCHAR should read bytes one by one (not character) |
153 when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char. | |
154 This is set to 1 by read1 temporarily while handling #@NUMBER. */ | |
155 static int load_each_byte; | |
156 | |
73800
4d1706442c96
(syms_of_lread): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
72132
diff
changeset
|
157 /* Function to use for loading an Emacs Lisp source file (not |
17038 | 158 compiled) instead of readevalloop. */ |
159 Lisp_Object Vload_source_file_function; | |
160 | |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
161 /* 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
|
162 Lisp_Object Vbyte_boolean_vars; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
163 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
164 /* 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
|
165 read. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
166 Lisp_Object Vread_with_symbol_positions; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
167 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
168 /* List of (SYMBOL . POSITION) accumulated so far. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
169 Lisp_Object Vread_symbol_positions_list; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
170 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
171 /* 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
|
172 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
|
173 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
174 /* File for get_file_char to read from. Use by load. */ |
341 | 175 static FILE *instream; |
176 | |
177 /* When nonzero, read conses in pure space */ | |
178 static int read_pure; | |
179 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
180 /* For use within read-from-string (this reader is non-reentrant!!) */ |
341 | 181 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
|
182 static int read_from_string_index_byte; |
341 | 183 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
|
184 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
185 /* 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
|
186 Fread_from_string. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
187 static int readchar_count; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
188 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
189 /* This contains the last string skipped with #@. */ |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
190 static char *saved_doc_string; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
191 /* Length of buffer allocated in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
192 static int saved_doc_string_size; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
193 /* Length of actual data in saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
194 static int saved_doc_string_length; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
195 /* 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
|
196 static file_offset saved_doc_string_position; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
197 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
198 /* 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
|
199 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
|
200 is put in saved_doc_string. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
201 static char *prev_saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
202 /* 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
|
203 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
|
204 /* 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
|
205 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
|
206 /* 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
|
207 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
|
208 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
209 /* 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
|
210 with no surrounding parentheses. |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
211 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
|
212 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
|
213 static int new_backquote_flag; |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
214 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
|
215 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
216 /* 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
|
217 check for recursive loads. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
218 |
61623
eac490378ade
(Vloads_in_progress): Static.
Lute Kamstra <lute@gnu.org>
parents:
61418
diff
changeset
|
219 static Lisp_Object Vloads_in_progress; |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
220 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
221 /* Non-zero means load dangerous compiled Lisp files. */ |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
222 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
223 int load_dangerous_libraries; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
224 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
225 /* 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
|
226 |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
227 int force_load_messages; |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
228 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
229 /* 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
|
230 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
231 static Lisp_Object Vbytecomp_version_regexp; |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
232 |
88886 | 233 static int read_emacs_mule_char P_ ((int, int (*) (int, Lisp_Object), |
234 Lisp_Object)); | |
235 | |
47847
dd601595b35d
Minor white space fix, just supplement the log for previous change:
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47839
diff
changeset
|
236 static void readevalloop P_ ((Lisp_Object, FILE*, Lisp_Object, |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
237 Lisp_Object (*) (), int, |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
238 Lisp_Object, Lisp_Object, |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
239 Lisp_Object, Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
240 static Lisp_Object load_unwind P_ ((Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
241 static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object)); |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
242 |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
243 static void invalid_syntax P_ ((const char *, int)) NO_RETURN; |
72005
da0099bc0ba4
* ebrowse.c (usage, version): Mark as NO_RETURN.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
71984
diff
changeset
|
244 static void end_of_file_error P_ (()) NO_RETURN; |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
245 |
341 | 246 |
88886 | 247 /* Functions that read one byte from the current source READCHARFUN |
248 or unreads one byte. If the integer argument C is -1, it returns | |
249 one read byte, or -1 when there's no more byte in the source. If C | |
250 is 0 or positive, it unreads C, and the return value is not | |
251 interesting. */ | |
252 | |
253 static int readbyte_for_lambda P_ ((int, Lisp_Object)); | |
254 static int readbyte_from_file P_ ((int, Lisp_Object)); | |
255 static int readbyte_from_string P_ ((int, Lisp_Object)); | |
256 | |
341 | 257 /* Handle unreading and rereading of characters. |
258 Write READCHAR to read a character, | |
17038 | 259 UNREAD(c) to unread c to be read again. |
260 | |
88886 | 261 These macros correctly read/unread multibyte characters. */ |
341 | 262 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
263 #define READCHAR readchar (readcharfun, NULL) |
341 | 264 #define UNREAD(c) unreadchar (readcharfun, c) |
265 | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
266 /* 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
|
267 #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
|
268 |
88886 | 269 /* When READCHARFUN is Qget_file_char, Qget_emacs_mule_file_char, |
89483 | 270 Qlambda, or a cons, we use this to keep an unread character because |
271 a file stream can't handle multibyte-char unreading. The value -1 | |
88886 | 272 means that there's no unread character. */ |
273 static int unread_char; | |
274 | |
341 | 275 static int |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
276 readchar (readcharfun, multibyte) |
341 | 277 Lisp_Object readcharfun; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
278 int *multibyte; |
341 | 279 { |
280 Lisp_Object tem; | |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
281 register int c; |
88886 | 282 int (*readbyte) P_ ((int, Lisp_Object)); |
283 unsigned char buf[MAX_MULTIBYTE_LENGTH]; | |
284 int i, len; | |
285 int emacs_mule_encoding = 0; | |
341 | 286 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
287 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
288 *multibyte = 0; |
341 | 289 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
290 readchar_count++; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
291 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
292 if (BUFFERP (readcharfun)) |
341 | 293 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
294 register struct buffer *inbuffer = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
295 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
296 int pt_byte = BUF_PT_BYTE (inbuffer); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
297 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
298 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
|
299 return -1; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
300 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
301 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
302 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
303 /* 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
|
304 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
|
305 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
|
306 c = STRING_CHAR (p); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
307 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
308 *multibyte = 1; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
309 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
310 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
311 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
312 c = BUF_FETCH_BYTE (inbuffer, pt_byte); |
88886 | 313 if (! ASCII_BYTE_P (c)) |
314 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
315 pt_byte++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
316 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
317 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
|
318 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
319 return c; |
341 | 320 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
321 if (MARKERP (readcharfun)) |
341 | 322 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
323 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
|
324 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
325 int bytepos = marker_byte_position (readcharfun); |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
326 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
327 if (bytepos >= BUF_ZV_BYTE (inbuffer)) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
328 return -1; |
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 if (! NILP (inbuffer->enable_multibyte_characters)) |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
331 { |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
332 /* 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
|
333 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
|
334 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
|
335 c = STRING_CHAR (p); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
336 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
337 *multibyte = 1; |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
338 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
339 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
340 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
341 c = BUF_FETCH_BYTE (inbuffer, bytepos); |
88886 | 342 if (! ASCII_BYTE_P (c)) |
343 c = BYTE8_TO_CHAR (c); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
344 bytepos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
345 } |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
346 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
347 XMARKER (readcharfun)->bytepos = bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
348 XMARKER (readcharfun)->charpos++; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
349 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
350 return c; |
341 | 351 } |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
352 |
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
353 if (EQ (readcharfun, Qlambda)) |
88886 | 354 { |
355 readbyte = readbyte_for_lambda; | |
356 goto read_multibyte; | |
357 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
358 |
341 | 359 if (EQ (readcharfun, Qget_file_char)) |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
360 { |
88886 | 361 readbyte = readbyte_from_file; |
362 goto read_multibyte; | |
8083
dc62b2daf48e
(readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents:
7898
diff
changeset
|
363 } |
341 | 364 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
365 if (STRINGP (readcharfun)) |
341 | 366 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
367 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
|
368 c = -1; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
369 else if (STRING_MULTIBYTE (readcharfun)) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
370 { |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
371 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
372 *multibyte = 1; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
373 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
|
374 read_from_string_index, |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
375 read_from_string_index_byte); |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
376 } |
29014
4c02859dda27
(read1): On reading multibyte string, be sure to make
Kenichi Handa <handa@m17n.org>
parents:
28746
diff
changeset
|
377 else |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
378 { |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
379 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
|
380 read_from_string_index++; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
381 read_from_string_index_byte++; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
382 } |
341 | 383 return c; |
384 } | |
385 | |
88886 | 386 if (CONSP (readcharfun)) |
387 { | |
388 /* This is the case that read_vector is reading from a unibyte | |
389 string that contains a byte sequence previously skipped | |
390 because of #@NUMBER. The car part of readcharfun is that | |
391 string, and the cdr part is a value of readcharfun given to | |
392 read_vector. */ | |
393 readbyte = readbyte_from_string; | |
394 if (EQ (XCDR (readcharfun), Qget_emacs_mule_file_char)) | |
395 emacs_mule_encoding = 1; | |
396 goto read_multibyte; | |
397 } | |
89483 | 398 |
88886 | 399 if (EQ (readcharfun, Qget_emacs_mule_file_char)) |
400 { | |
401 readbyte = readbyte_from_file; | |
402 emacs_mule_encoding = 1; | |
403 goto read_multibyte; | |
404 } | |
341 | 405 |
406 tem = call0 (readcharfun); | |
407 | |
485 | 408 if (NILP (tem)) |
341 | 409 return -1; |
410 return XINT (tem); | |
88886 | 411 |
412 read_multibyte: | |
413 if (unread_char >= 0) | |
414 { | |
415 c = unread_char; | |
416 unread_char = -1; | |
417 return c; | |
418 } | |
419 c = (*readbyte) (-1, readcharfun); | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
420 if (c < 0 || load_each_byte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
421 return c; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
422 if (multibyte) |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
423 *multibyte = 1; |
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
424 if (ASCII_BYTE_P (c)) |
88886 | 425 return c; |
426 if (emacs_mule_encoding) | |
427 return read_emacs_mule_char (c, readbyte, readcharfun); | |
428 i = 0; | |
429 buf[i++] = c; | |
430 len = BYTES_BY_CHAR_HEAD (c); | |
431 while (i < len) | |
432 { | |
433 c = (*readbyte) (-1, readcharfun); | |
434 if (c < 0 || ! TRAILING_CODE_P (c)) | |
435 { | |
436 while (--i > 1) | |
437 (*readbyte) (buf[i], readcharfun); | |
438 return BYTE8_TO_CHAR (buf[0]); | |
439 } | |
440 buf[i++] = c; | |
441 } | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
106133
diff
changeset
|
442 return STRING_CHAR (buf); |
341 | 443 } |
444 | |
445 /* Unread the character C in the way appropriate for the stream READCHARFUN. | |
446 If the stream is a user function, call it with the char as argument. */ | |
447 | |
448 static void | |
449 unreadchar (readcharfun, c) | |
450 Lisp_Object readcharfun; | |
451 int c; | |
452 { | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
453 readchar_count--; |
6471
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
454 if (c == -1) |
4e6b54b64d94
(unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents:
6470
diff
changeset
|
455 /* 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
|
456 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
|
457 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
458 else if (BUFFERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
459 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
460 struct buffer *b = XBUFFER (readcharfun); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
461 int bytepos = BUF_PT_BYTE (b); |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
462 |
88886 | 463 BUF_PT (b)--; |
464 if (! NILP (b->enable_multibyte_characters)) | |
465 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
466 else |
88886 | 467 bytepos--; |
468 | |
469 BUF_PT_BYTE (b) = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
470 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
471 else if (MARKERP (readcharfun)) |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
472 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
473 struct buffer *b = XMARKER (readcharfun)->buffer; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
474 int bytepos = XMARKER (readcharfun)->bytepos; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
475 |
88886 | 476 XMARKER (readcharfun)->charpos--; |
477 if (! NILP (b->enable_multibyte_characters)) | |
478 BUF_DEC_POS (b, bytepos); | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
479 else |
88886 | 480 bytepos--; |
481 | |
482 XMARKER (readcharfun)->bytepos = bytepos; | |
20691
cf1919e207ef
(unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents:
20669
diff
changeset
|
483 } |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
484 else if (STRINGP (readcharfun)) |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
485 { |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
486 read_from_string_index--; |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
487 read_from_string_index_byte |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
488 = 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
|
489 } |
88886 | 490 else if (CONSP (readcharfun)) |
491 { | |
492 unread_char = c; | |
493 } | |
22691
ff0ed53342b3
(read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents:
22603
diff
changeset
|
494 else if (EQ (readcharfun, Qlambda)) |
88886 | 495 { |
496 unread_char = c; | |
497 } | |
498 else if (EQ (readcharfun, Qget_file_char) | |
499 || EQ (readcharfun, Qget_emacs_mule_file_char)) | |
500 { | |
501 if (load_each_byte) | |
90789 | 502 { |
503 BLOCK_INPUT; | |
504 ungetc (c, instream); | |
505 UNBLOCK_INPUT; | |
506 } | |
88886 | 507 else |
508 unread_char = c; | |
509 } | |
341 | 510 else |
511 call1 (readcharfun, make_number (c)); | |
512 } | |
513 | |
88886 | 514 static int |
515 readbyte_for_lambda (c, readcharfun) | |
516 int c; | |
517 Lisp_Object readcharfun; | |
518 { | |
519 return read_bytecode_char (c >= 0); | |
520 } | |
521 | |
522 | |
523 static int | |
524 readbyte_from_file (c, readcharfun) | |
525 int c; | |
526 Lisp_Object readcharfun; | |
527 { | |
528 if (c >= 0) | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
529 { |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
530 BLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
531 ungetc (c, instream); |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
532 UNBLOCK_INPUT; |
88886 | 533 return 0; |
534 } | |
535 | |
90789 | 536 BLOCK_INPUT; |
88886 | 537 c = getc (instream); |
90789 | 538 |
88886 | 539 #ifdef EINTR |
90789 | 540 /* Interrupted reads have been observed while reading over the network */ |
541 while (c == EOF && ferror (instream) && errno == EINTR) | |
542 { | |
90796 | 543 UNBLOCK_INPUT; |
90789 | 544 QUIT; |
545 BLOCK_INPUT; | |
90796 | 546 clearerr (instream); |
90789 | 547 c = getc (instream); |
548 } | |
88886 | 549 #endif |
90789 | 550 |
90796 | 551 UNBLOCK_INPUT; |
552 | |
88886 | 553 return (c == EOF ? -1 : c); |
554 } | |
555 | |
556 static int | |
557 readbyte_from_string (c, readcharfun) | |
558 int c; | |
559 Lisp_Object readcharfun; | |
560 { | |
561 Lisp_Object string = XCAR (readcharfun); | |
562 | |
563 if (c >= 0) | |
564 { | |
565 read_from_string_index--; | |
566 read_from_string_index_byte | |
567 = string_char_to_byte (string, read_from_string_index); | |
568 } | |
89483 | 569 |
88886 | 570 if (read_from_string_index >= read_from_string_limit) |
571 c = -1; | |
572 else | |
573 FETCH_STRING_CHAR_ADVANCE (c, string, | |
574 read_from_string_index, | |
575 read_from_string_index_byte); | |
576 return c; | |
577 } | |
578 | |
579 | |
580 /* Read one non-ASCII character from INSTREAM. The character is | |
581 encoded in `emacs-mule' and the first byte is already read in | |
582 C. */ | |
583 | |
584 extern char emacs_mule_bytes[256]; | |
585 | |
586 static int | |
587 read_emacs_mule_char (c, readbyte, readcharfun) | |
588 int c; | |
589 int (*readbyte) P_ ((int, Lisp_Object)); | |
590 Lisp_Object readcharfun; | |
591 { | |
592 /* Emacs-mule coding uses at most 4-byte for one character. */ | |
593 unsigned char buf[4]; | |
594 int len = emacs_mule_bytes[c]; | |
595 struct charset *charset; | |
596 int i; | |
597 unsigned code; | |
598 | |
599 if (len == 1) | |
600 /* C is not a valid leading-code of `emacs-mule'. */ | |
601 return BYTE8_TO_CHAR (c); | |
602 | |
603 i = 0; | |
604 buf[i++] = c; | |
605 while (i < len) | |
606 { | |
607 c = (*readbyte) (-1, readcharfun); | |
608 if (c < 0xA0) | |
609 { | |
610 while (--i > 1) | |
611 (*readbyte) (buf[i], readcharfun); | |
612 return BYTE8_TO_CHAR (buf[0]); | |
613 } | |
614 buf[i++] = c; | |
615 } | |
616 | |
617 if (len == 2) | |
618 { | |
89417 | 619 charset = emacs_mule_charset[buf[0]]; |
88886 | 620 code = buf[1] & 0x7F; |
621 } | |
622 else if (len == 3) | |
623 { | |
624 if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 | |
625 || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) | |
626 { | |
627 charset = emacs_mule_charset[buf[1]]; | |
628 code = buf[2] & 0x7F; | |
629 } | |
630 else | |
631 { | |
632 charset = emacs_mule_charset[buf[0]]; | |
633 code = ((buf[1] << 8) | buf[2]) & 0x7F7F; | |
634 } | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
635 } |
341 | 636 else |
88886 | 637 { |
638 charset = emacs_mule_charset[buf[1]]; | |
89483 | 639 code = ((buf[2] << 8) | buf[3]) & 0x7F7F; |
88886 | 640 } |
641 c = DECODE_CHAR (charset, code); | |
642 if (c < 0) | |
643 Fsignal (Qinvalid_read_syntax, | |
644 Fcons (build_string ("invalid multibyte form"), Qnil)); | |
645 return c; | |
341 | 646 } |
647 | |
88886 | 648 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
649 static Lisp_Object read_internal_start P_ ((Lisp_Object, Lisp_Object, |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
650 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
651 static Lisp_Object read0 P_ ((Lisp_Object)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
652 static Lisp_Object read1 P_ ((Lisp_Object, int *, int)); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
653 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
654 static Lisp_Object read_list P_ ((int, Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
655 static Lisp_Object read_vector P_ ((Lisp_Object, int)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
656 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
657 static Lisp_Object substitute_object_recurse P_ ((Lisp_Object, Lisp_Object, |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
658 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
659 static void substitute_object_in_subtree P_ ((Lisp_Object, |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
660 Lisp_Object)); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
661 static void substitute_in_interval P_ ((INTERVAL, Lisp_Object)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
662 |
341 | 663 |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
664 /* Get a character from the tty. */ |
341 | 665 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
666 /* 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
|
667 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
668 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
|
669 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
|
670 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
|
671 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
672 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
|
673 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
|
674 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
|
675 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
676 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
|
677 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
|
678 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
|
679 character. |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
680 |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
681 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
|
682 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
|
683 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
684 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
|
685 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
|
686 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
687 Lisp_Object |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
688 read_filtered_event (no_switch_frame, ascii_required, error_nonascii, |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
689 input_method, seconds) |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
690 int no_switch_frame, ascii_required, error_nonascii, input_method; |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
691 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
|
692 { |
71672
9c4db0e8490f
(read_filtered_event): Remove `register' qualifier because it
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71558
diff
changeset
|
693 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
|
694 EMACS_TIME end_time; |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
695 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
696 #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
|
697 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
698 cancel_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
699 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
700 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
701 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
|
702 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
703 /* Compute timeout. */ |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
704 if (NUMBERP (seconds)) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
705 { |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
706 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
|
707 int sec, usec; |
74566
040d179fb669
(Feval_buffer, Feval_region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73800
diff
changeset
|
708 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
|
709 |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
710 sec = (int) duration; |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
711 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
|
712 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
|
713 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
|
714 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
|
715 } |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
716 |
83533 | 717 /* 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
|
718 retry: |
85000
2c723350c8ec
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84465
diff
changeset
|
719 do |
83533 | 720 val = read_char (0, 0, 0, (input_method ? Qnil : Qt), 0, |
721 NUMBERP (seconds) ? &end_time : NULL); | |
83460
dbd791ef90a1
Eliminate wrong_kboard_jmpbuf.
Karoly Lorentey <lorentey@elte.hu>
parents:
83450
diff
changeset
|
722 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
|
723 |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
724 if (BUFFERP (val)) |
5888
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
diff
changeset
|
725 goto retry; |
0d02ee7ee659
(read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents:
5687
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 /* switch-frame events are put off until after the next ASCII |
14036 | 728 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
|
729 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
|
730 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
|
731 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
|
732 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
|
733 && 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
|
734 && 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
|
735 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
736 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
|
737 goto retry; |
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 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
740 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
|
741 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
742 /* 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
|
743 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
|
744 { |
25787
3d1138357287
(readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
745 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
|
746 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
|
747 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
|
748 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
749 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
|
750 /* 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
|
751 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
|
752 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
|
753 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
|
754 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
755 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
756 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
757 /* 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
|
758 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
|
759 { |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
760 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
|
761 { |
7106
06542cc6ddcd
(read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
762 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
|
763 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
|
764 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
765 else |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
766 goto retry; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
767 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
768 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
769 |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
770 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
|
771 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
|
772 |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
773 #if 0 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
774 |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
775 #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
|
776 if (display_hourglass_p) |
e033d60bd048
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents:
35543
diff
changeset
|
777 start_hourglass (); |
28633
83d4e44ed68e
(read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
778 #endif |
43700
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
779 |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
780 #endif |
2388863b284b
(read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents:
43669
diff
changeset
|
781 |
2654
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
782 return val; |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
783 } |
ba685dcc3750
Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents:
2545
diff
changeset
|
784 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
785 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
|
786 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
|
787 It is returned as a number. |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
788 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
|
789 character code if possible (e.g. C-SPC -> 0). |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
790 |
40796
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 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
|
792 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
|
793 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
|
794 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
|
795 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
|
796 `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
|
797 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
798 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
|
799 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
|
800 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
|
801 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
|
802 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
|
803 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
|
804 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
|
805 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
806 (prompt, inherit_input_method, seconds) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
807 Lisp_Object prompt, inherit_input_method, seconds; |
341 | 808 { |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
809 Lisp_Object val; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
810 |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
811 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
812 message_with_string ("%s", prompt, 0); |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
813 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
|
814 |
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
815 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
|
816 : make_number (char_resolve_modifier_mask (XINT (val)))); |
341 | 817 } |
818 | |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
819 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
|
820 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
|
821 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
|
822 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
|
823 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
|
824 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
|
825 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
|
826 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
|
827 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
|
828 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
829 (prompt, inherit_input_method, seconds) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
830 Lisp_Object prompt, 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
|
831 { |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
832 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
833 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
|
834 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
|
835 } |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
836 |
72132
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
837 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
|
838 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
|
839 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
|
840 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
|
841 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
|
842 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
843 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
|
844 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
|
845 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
|
846 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
|
847 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
|
848 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
|
849 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
|
850 floating-point value. */) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
851 (prompt, inherit_input_method, seconds) |
9ac2eb12b7f1
* lread.c (read_filtered_event): New arg SECONDS to wait until.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
852 Lisp_Object prompt, inherit_input_method, seconds; |
341 | 853 { |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
854 Lisp_Object val; |
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
855 |
23056
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
856 if (! NILP (prompt)) |
1b44597160c3
(read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22889
diff
changeset
|
857 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
|
858 |
92497
f45795db28f6
(Fread_char): Resolve modifiers.
Kenichi Handa <handa@m17n.org>
parents:
91615
diff
changeset
|
859 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
|
860 |
9a4bddae759e
(Fread_char, Fread_char_exclusive): If no character event is read
Chong Yidong <cyd@stupidchicken.com>
parents:
97142
diff
changeset
|
861 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
|
862 : make_number (char_resolve_modifier_mask (XINT (val)))); |
341 | 863 } |
864 | |
865 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
|
866 doc: /* Don't use this yourself. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
867 () |
341 | 868 { |
869 register Lisp_Object val; | |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
870 BLOCK_INPUT; |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
871 XSETINT (val, getc (instream)); |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
872 UNBLOCK_INPUT; |
341 | 873 return val; |
874 } | |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
875 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
876 |
341 | 877 |
88886 | 878 /* Value is a version number of byte compiled code if the file |
91041 | 879 associated with file descriptor FD is a compiled Lisp file that's |
88886 | 880 safe to load. Only files compiled with Emacs are safe to load. |
881 Files compiled with XEmacs can lead to a crash in Fbyte_code | |
882 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
|
883 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
884 static int |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
885 safe_to_load_p (fd) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
886 int fd; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
887 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
888 char buf[512]; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
889 int nbytes, i; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
890 int safe_p = 1; |
89483 | 891 int version = 1; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
892 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
893 /* 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
|
894 specifying the byte compiler version used. */ |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
895 nbytes = emacs_read (fd, buf, sizeof buf - 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
896 if (nbytes > 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
897 { |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
898 buf[nbytes] = '\0'; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
899 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
900 /* Skip to the next newline, skipping over the initial `ELC' |
88774 | 901 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
|
902 for (i = 0; i < nbytes && buf[i] != '\n'; ++i) |
88774 | 903 if (i == 4) |
88886 | 904 version = buf[i]; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
905 |
89012
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
906 if (i == nbytes |
0457e4f05273
(safe_to_load_p): Fix the logic.
Kenichi Handa <handa@m17n.org>
parents:
88888
diff
changeset
|
907 || 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
|
908 buf + i) < 0) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
909 safe_p = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
910 } |
88774 | 911 if (safe_p) |
912 safe_p = version; | |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
913 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
914 lseek (fd, 0, SEEK_SET); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
915 return safe_p; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
916 } |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
917 |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
918 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
919 /* 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
|
920 after loading a file successfully. */ |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
921 |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
922 static Lisp_Object |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
923 record_load_unwind (old) |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
924 Lisp_Object old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
925 { |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
926 return Vloads_in_progress = old; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
927 } |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
928 |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
929 /* 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
|
930 |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
931 static Lisp_Object |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
932 load_error_handler (data) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
933 Lisp_Object data; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
934 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
935 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
936 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
937 |
78617
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
938 static Lisp_Object |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
939 load_warn_old_style_backquotes (file) |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
940 Lisp_Object file; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
941 { |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
942 if (!NILP (Vold_style_backquotes)) |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
943 { |
78628
29320ef98233
(load_warn_old_style_backquotes): Fix up array size typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78617
diff
changeset
|
944 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
|
945 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
|
946 args[1] = file; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
947 Fmessage (2, args); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
948 } |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
949 return Qnil; |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
950 } |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
951 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
952 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
|
953 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
|
954 required. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
955 This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
956 () |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
957 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
958 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
|
959 while (CONSP (suffixes)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
960 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
961 Lisp_Object exts = Vload_file_rep_suffixes; |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
962 suffix = XCAR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
963 suffixes = XCDR (suffixes); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
964 while (CONSP (exts)) |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
965 { |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
966 ext = XCAR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
967 exts = XCDR (exts); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
968 lst = Fcons (concat2 (suffix, ext), lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
969 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
970 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
971 return Fnreverse (lst); |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
972 } |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
973 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
974 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
|
975 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
|
976 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
|
977 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
|
978 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
|
979 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
|
980 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
|
981 |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
982 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
|
983 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
|
984 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
|
985 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
|
986 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
|
987 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
|
988 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
|
989 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
|
990 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
|
991 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
|
992 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
993 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
|
994 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
|
995 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
|
996 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
|
997 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
|
998 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
999 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
|
1000 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
|
1001 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
|
1002 `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
|
1003 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
|
1004 and then the former. |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1005 |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1006 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
|
1007 `require' calls, in an element of `load-history' whose |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1008 car is the file name loaded. See `load-history'. |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1009 |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1010 Return t if the file exists and loads successfully. */) |
40796
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1011 (file, noerror, nomessage, nosuffix, must_suffix) |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
1012 Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; |
341 | 1013 { |
1014 register FILE *stream; | |
1015 register int fd = -1; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1016 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
|
1017 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
|
1018 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
|
1019 /* 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
|
1020 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
|
1021 /* 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
|
1022 int compiled = 0; |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
1023 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
|
1024 int safe_p = 1; |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1025 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
|
1026 Lisp_Object tmp[2]; |
88886 | 1027 int version; |
1028 | |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
1029 #ifdef DOS_NT |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1030 fmode = "rt"; |
9790
637b4664f7a5
Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents:
9552
diff
changeset
|
1031 #endif /* DOS_NT */ |
341 | 1032 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1033 CHECK_STRING (file); |
341 | 1034 |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
1035 /* 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
|
1036 /* 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
|
1037 handler = Ffind_file_name_handler (file, Qload); |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1038 if (!NILP (handler)) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1039 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
|
1040 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
1041 /* 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
|
1042 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
|
1043 (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
|
1044 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
|
1045 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
|
1046 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
|
1047 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
|
1048 that it seemed risky to remove. */ |
48910
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1049 if (! NILP (noerror)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1050 { |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1051 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
|
1052 Qt, load_error_handler); |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1053 if (NILP (file)) |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1054 return Qnil; |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1055 } |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1056 else |
f1010d7b4fd9
(load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48726
diff
changeset
|
1057 file = Fsubstitute_in_file_name (file); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
1058 |
10014
d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents:
9938
diff
changeset
|
1059 |
341 | 1060 /* Avoid weird lossage with null string as arg, |
1061 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
|
1062 if (SCHARS (file) > 0) |
341 | 1063 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1064 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
|
1065 |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1066 found = Qnil; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1067 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
|
1068 |
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
|
1069 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
|
1070 { |
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
|
1071 /* 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
|
1072 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
|
1073 && !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
|
1074 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
|
1075 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
|
1076 && !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
|
1077 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
|
1078 /* 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
|
1079 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
|
1080 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
|
1081 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
|
1082 } |
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
|
1083 |
19115
266915689f9e
(Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents:
19020
diff
changeset
|
1084 fd = openp (Vload_path, file, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1085 (!NILP (nosuffix) ? Qnil |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1086 : !NILP (must_suffix) ? Fget_load_suffixes () |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1087 : Fappend (2, (tmp[0] = Fget_load_suffixes (), |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
1088 tmp[1] = Vload_file_rep_suffixes, |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1089 tmp))), |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1090 &found, Qnil); |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1091 UNGCPRO; |
341 | 1092 } |
1093 | |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1094 if (fd == -1) |
341 | 1095 { |
485 | 1096 if (NILP (noerror)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1097 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
|
1098 return Qnil; |
341 | 1099 } |
1100 | |
29122
47f68a566622
(Fload): Add a comment about the meaning of
Gerd Moellmann <gerd@gnu.org>
parents:
29014
diff
changeset
|
1101 /* 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
|
1102 if (EQ (Qt, Vuser_init_file)) |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1103 Vuser_init_file = found; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
1104 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1105 /* 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
|
1106 if (fd == -2) |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1107 { |
23193
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1108 if (NILP (Fequal (found, file))) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1109 /* 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
|
1110 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
|
1111 the `load' operation on FILE. */ |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1112 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
|
1113 else |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1114 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
|
1115 if (! NILP (handler)) |
c12a3c0be4ee
(Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents:
23159
diff
changeset
|
1116 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
|
1117 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1118 |
31804
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1119 /* 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
|
1120 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1121 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
|
1122 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
|
1123 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
|
1124 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
|
1125 leads to a certain amount of ``normal'' recursion. |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1126 |
e57e942d4ca1
(Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31554
diff
changeset
|
1127 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
|
1128 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
|
1129 { |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1130 int count = 0; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1131 Lisp_Object tem; |
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1132 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
|
1133 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
|
1134 { |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1135 if (fd >= 0) |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1136 emacs_close (fd); |
12ffc72c0bbc
* lread.c (Fload): Stop checking Vloads_in_progress and signal
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1137 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
|
1138 } |
41463
078a3890c752
(Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents:
40931
diff
changeset
|
1139 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
|
1140 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
|
1141 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1142 |
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
|
1143 /* 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
|
1144 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
|
1145 ? 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
|
1146 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
|
1147 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
|
1148 : 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
|
1149 |
88886 | 1150 version = -1; |
91015 | 1151 |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
1152 /* 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
|
1153 specbind (Qold_style_backquotes, Qnil); |
a16793949fe1
(Qold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78614
diff
changeset
|
1154 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
|
1155 |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1156 if (!bcmp (SDATA (found) + SBYTES (found) - 4, |
88886 | 1157 ".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
|
1158 || (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
|
1159 /* 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
|
1160 remote and have no handler! */ |
341 | 1161 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1162 if (fd != -2) |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1163 { |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1164 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
|
1165 int result; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1166 |
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
|
1167 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1168 |
88886 | 1169 if (version < 0 |
1170 && ! (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
|
1171 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1172 safe_p = 0; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1173 if (!load_dangerous_libraries) |
48087
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1174 { |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1175 if (fd >= 0) |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1176 emacs_close (fd); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1177 error ("File `%s' was not compiled in Emacs", |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1178 SDATA (found)); |
cae822515e00
(Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents:
47919
diff
changeset
|
1179 } |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1180 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
|
1181 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
|
1182 } |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1183 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1184 compiled = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1185 |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1186 efound = ENCODE_FILE (found); |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1187 |
33570 | 1188 #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
|
1189 fmode = "rb"; |
33570 | 1190 #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
|
1191 stat ((char *)SDATA (efound), &s1); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1192 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
|
1193 result = stat ((char *)SDATA (efound), &s2); |
46429
eb5964b8cc24
* lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46375
diff
changeset
|
1194 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
|
1195 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1196 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
|
1197 { |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1198 /* 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
|
1199 newer = 1; |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1200 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1201 /* 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
|
1202 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
|
1203 { |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1204 Lisp_Object msg_file; |
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1205 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
|
1206 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
|
1207 msg_file, 1); |
43837
ae392efb1660
(Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents:
43713
diff
changeset
|
1208 } |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1209 } |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1210 UNGCPRO; |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1211 } |
341 | 1212 } |
17038 | 1213 else |
1214 { | |
1215 /* We are loading a source file (*.el). */ | |
1216 if (!NILP (Vload_source_file_function)) | |
1217 { | |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1218 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
|
1219 |
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1220 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
|
1221 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
|
1222 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
|
1223 NILP (noerror) ? Qnil : Qt, |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1224 (NILP (nomessage) || force_load_messages) ? Qnil : Qt); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1225 return unbind_to (count, val); |
17038 | 1226 } |
1227 } | |
341 | 1228 |
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
|
1229 GCPRO3 (file, found, hist_file_name); |
66284
236b02d0dac9
(Fload): Simplify gcpro structure.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1230 |
21936
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1231 #ifdef WINDOWSNT |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1232 emacs_close (fd); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1233 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
|
1234 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
|
1235 #else /* not WINDOWSNT */ |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1236 stream = fdopen (fd, fmode); |
6635a9f225a9
(Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents:
21935
diff
changeset
|
1237 #endif /* not WINDOWSNT */ |
341 | 1238 if (stream == 0) |
1239 { | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
1240 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
|
1241 error ("Failure to create stdio stream for %s", SDATA (file)); |
341 | 1242 } |
1243 | |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
1244 if (! NILP (Vpurify_flag)) |
105798
0ad1fc06bfc8
* puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105028
diff
changeset
|
1245 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
|
1246 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1247 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
|
1248 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1249 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1250 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
|
1251 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1252 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1253 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
|
1254 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1255 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
|
1256 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1257 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
|
1258 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
|
1259 } |
341 | 1260 |
64533
dc17db575e11
(Fload, load_unwind): Use make_save_value to unwind
Kim F. Storm <storm@cua.dk>
parents:
64317
diff
changeset
|
1261 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
|
1262 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
|
1263 specbind (Qload_file_name, found); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1264 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
|
1265 load_descriptor_list |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1266 = 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
|
1267 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
|
1268 if (! version || version >= 22) |
90428 | 1269 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
|
1270 Feval, 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1271 else |
1272 { | |
1273 /* We can't handle a file which was compiled with | |
1274 byte-compile-dynamic by older version of Emacs. */ | |
1275 specbind (Qload_force_doc_strings, Qt); | |
90428 | 1276 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
|
1277 0, Qnil, Qnil, Qnil, Qnil); |
88886 | 1278 } |
341 | 1279 unbind_to (count, Qnil); |
1280 | |
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
|
1281 /* 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
|
1282 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
|
1283 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
|
1284 |
341 | 1285 UNGCPRO; |
1286 | |
95860
353a9f7910cf
* lread.c (Fload): Use xfree, not free on saved_doc_string.
Jim Meyering <jim@meyering.net>
parents:
95481
diff
changeset
|
1287 xfree (saved_doc_string); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1288 saved_doc_string = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1289 saved_doc_string_size = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
1290 |
95481
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95479
diff
changeset
|
1291 xfree (prev_saved_doc_string); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1292 prev_saved_doc_string = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1293 prev_saved_doc_string_size = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
1294 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
1295 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
|
1296 { |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1297 if (!safe_p) |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1298 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
|
1299 file, 1); |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
1300 else if (!compiled) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1301 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
|
1302 else if (newer) |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
1303 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
|
1304 file, 1); |
20168
13074c25ab06
Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents:
20048
diff
changeset
|
1305 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
|
1306 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
|
1307 } |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
1308 |
341 | 1309 return Qt; |
1310 } | |
1311 | |
1312 static Lisp_Object | |
64536
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1313 load_unwind (arg) /* used as unwind-protect function in load */ |
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1314 Lisp_Object arg; |
341 | 1315 { |
64536
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1316 FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; |
0fa146cd9142
(load_unwind): Rework last change.
Kim F. Storm <storm@cua.dk>
parents:
64533
diff
changeset
|
1317 if (stream != NULL) |
76624
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1318 { |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1319 BLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1320 fclose (stream); |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1321 UNBLOCK_INPUT; |
c8af69547c16
Include blockinput.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
75632
diff
changeset
|
1322 } |
341 | 1323 return Qnil; |
1324 } | |
1325 | |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1326 static Lisp_Object |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1327 load_descriptor_unwind (oldlist) |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1328 Lisp_Object oldlist; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1329 { |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1330 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
|
1331 return Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1332 } |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1333 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1334 /* 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
|
1335 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
|
1336 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1337 void |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1338 close_load_descs () |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1339 { |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
1340 #ifndef WINDOWSNT |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1341 Lisp_Object tail; |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85127
diff
changeset
|
1342 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
|
1343 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
|
1344 #endif |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
1345 } |
341 | 1346 |
1347 static int | |
1348 complete_filename_p (pathname) | |
1349 Lisp_Object pathname; | |
1350 { | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1351 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
|
1352 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
|
1353 || (SCHARS (pathname) > 2 |
97142 | 1354 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))); |
341 | 1355 } |
1356 | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1357 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
|
1358 doc: /* Search for FILENAME through PATH. |
62116
f1b7fe92d96a
(Flocate_file_internal): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
61623
diff
changeset
|
1359 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
|
1360 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
|
1361 file name when searching. |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1362 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
|
1363 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
|
1364 in which case file-name-handlers are ignored. */) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1365 (filename, path, suffixes, predicate) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1366 Lisp_Object filename, path, suffixes, predicate; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1367 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1368 Lisp_Object file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1369 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
|
1370 if (NILP (predicate) && fd > 0) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1371 close (fd); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1372 return file; |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1373 } |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1374 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1375 |
341 | 1376 /* Search for a file whose name is STR, looking in directories |
1377 in the Lisp list PATH, and trying suffixes from SUFFIX. | |
1378 On success, returns a file descriptor. On failure, returns -1. | |
1379 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1380 SUFFIXES is a list of strings containing possible suffixes. |
78501 | 1381 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
|
1382 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1383 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
|
1384 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
|
1385 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
|
1386 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
|
1387 are ignored). |
341 | 1388 |
1389 If STOREPTR is nonzero, it points to a slot where the name of | |
1390 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
|
1391 nil is stored there on failure. |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1392 |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1393 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
|
1394 but store the found remote file name in *STOREPTR. */ |
341 | 1395 |
1396 int | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1397 openp (path, str, suffixes, storeptr, predicate) |
341 | 1398 Lisp_Object path, str; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1399 Lisp_Object suffixes; |
341 | 1400 Lisp_Object *storeptr; |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1401 Lisp_Object predicate; |
341 | 1402 { |
1403 register int fd; | |
1404 int fn_size = 100; | |
1405 char buf[100]; | |
1406 register char *fn = buf; | |
1407 int absolute = 0; | |
1408 int want_size; | |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1409 Lisp_Object filename; |
341 | 1410 struct stat st; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1411 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
|
1412 Lisp_Object string, tail, encoded_fn; |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1413 int max_suffix_len = 0; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1414 |
51380
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1415 CHECK_STRING (str); |
0254c3b1ede8
(openp): Make sure STR is a string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51066
diff
changeset
|
1416 |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1417 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
|
1418 { |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
1419 CHECK_STRING_CAR (tail); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1420 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
|
1421 SBYTES (XCAR (tail))); |
40211
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1422 } |
19a89ce104dd
(syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1423 |
68649
70566c3d72b1
(openp): Initialized encoded_fn before GCPRO it.
Kenichi Handa <handa@m17n.org>
parents:
68301
diff
changeset
|
1424 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
|
1425 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
|
1426 |
341 | 1427 if (storeptr) |
1428 *storeptr = Qnil; | |
1429 | |
1430 if (complete_filename_p (str)) | |
1431 absolute = 1; | |
1432 | |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1433 for (; CONSP (path); path = XCDR (path)) |
341 | 1434 { |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1435 filename = Fexpand_file_name (str, XCAR (path)); |
341 | 1436 if (!complete_filename_p (filename)) |
1437 /* If there are non-absolute elts in PATH (eg ".") */ | |
1438 /* Of course, this could conceivably lose if luser sets | |
1439 default-directory to be something non-absolute... */ | |
1440 { | |
1441 filename = Fexpand_file_name (filename, current_buffer->directory); | |
1442 if (!complete_filename_p (filename)) | |
1443 /* Give up on this path element! */ | |
1444 continue; | |
1445 } | |
1446 | |
1447 /* Calculate maximum size of any filename made from | |
1448 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
|
1449 want_size = max_suffix_len + SBYTES (filename) + 1; |
341 | 1450 if (fn_size < want_size) |
1451 fn = (char *) alloca (fn_size = 100 + want_size); | |
1452 | |
1453 /* 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
|
1454 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
|
1455 CONSP (tail); tail = XCDR (tail)) |
341 | 1456 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1457 int lsuffix = SBYTES (XCAR (tail)); |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1458 Lisp_Object handler; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1459 int exists; |
341 | 1460 |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1461 /* 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
|
1462 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
|
1463 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
|
1464 && 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
|
1465 && SREF (filename, 1) == ':') |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1466 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1467 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
|
1468 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
|
1469 fn[SBYTES (filename) - 2] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1470 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1471 else |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1472 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1473 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
|
1474 SBYTES (filename)); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1475 fn[SBYTES (filename)] = 0; |
16383
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1476 } |
497b37552adb
(openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents:
16342
diff
changeset
|
1477 |
341 | 1478 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
|
1479 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
|
1480 |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1481 /* 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
|
1482 /* 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
|
1483 if (absolute) |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1484 handler = Qnil; |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1485 else |
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
1486 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
|
1487 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
|
1488 (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
|
1489 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
|
1490 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
|
1491 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
|
1492 { |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1493 if (NILP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1494 exists = !NILP (Ffile_readable_p (string)); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1495 else |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1496 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
|
1497 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
|
1498 exists = 0; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1499 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1500 if (exists) |
341 | 1501 { |
1502 /* We succeeded; return this descriptor and filename. */ | |
1503 if (storeptr) | |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1504 *storeptr = string; |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1505 UNGCPRO; |
33442
ec5c714ae981
(openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents:
31804
diff
changeset
|
1506 return -2; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1507 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1508 } |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1509 else |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1510 { |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
1511 const char *pfn; |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1512 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1513 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
|
1514 pfn = SDATA (encoded_fn); |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1515 exists = (stat (pfn, &st) >= 0 |
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1516 && (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
|
1517 if (exists) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1518 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1519 /* 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
|
1520 if (NATNUMP (predicate)) |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1521 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
|
1522 else |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1523 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
|
1524 |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1525 if (fd >= 0) |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1526 { |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1527 /* 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
|
1528 if (storeptr) |
44222
885bedb3a37b
(openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents:
43837
diff
changeset
|
1529 *storeptr = string; |
16937
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1530 UNGCPRO; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1531 return fd; |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
1532 } |
341 | 1533 } |
1534 } | |
1535 } | |
6392
58e075552627
(openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents:
6072
diff
changeset
|
1536 if (absolute) |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1537 break; |
341 | 1538 } |
1539 | |
8906
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1540 UNGCPRO; |
93f3d6f5753c
(openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8828
diff
changeset
|
1541 return -1; |
341 | 1542 } |
1543 | |
1544 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1545 /* 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
|
1546 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
|
1547 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
|
1548 |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1549 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
|
1550 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
|
1551 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1552 static void |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1553 build_load_history (filename, entire) |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1554 Lisp_Object filename; |
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1555 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
|
1556 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1557 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
|
1558 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
|
1559 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
|
1560 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1561 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
|
1562 prev = Qnil; |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1563 |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1564 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
|
1565 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1566 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
|
1567 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1568 /* 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
|
1569 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
|
1570 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1571 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
|
1572 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1573 /* 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
|
1574 if (entire) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1575 { |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1576 if (NILP (prev)) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1577 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
|
1578 else |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1579 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
|
1580 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1581 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1582 /* 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
|
1583 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1584 { |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1585 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
|
1586 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1587 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
|
1588 { |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1589 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
|
1590 |
47021
3bd4234e0844
(build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents:
46472
diff
changeset
|
1591 if (NILP (Fmember (newelt, tem))) |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1592 Fsetcar (tail, Fcons (XCAR (tem), |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1593 Fcons (newelt, XCDR (tem)))); |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1594 |
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1595 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
|
1596 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1597 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1598 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1599 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1600 else |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1601 prev = tail; |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
1602 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
|
1603 QUIT; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1604 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1605 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1606 /* 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
|
1607 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
|
1608 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
|
1609 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
|
1610 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
|
1611 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
|
1612 } |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1613 |
341 | 1614 Lisp_Object |
30917
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1615 unreadpure (junk) /* Used as unwind-protect function in readevalloop */ |
469d242e5f72
Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents:
29486
diff
changeset
|
1616 Lisp_Object junk; |
341 | 1617 { |
1618 read_pure = 0; | |
1619 return Qnil; | |
1620 } | |
1621 | |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1622 static Lisp_Object |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1623 readevalloop_1 (old) |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1624 Lisp_Object old; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1625 { |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1626 load_convert_to_unibyte = ! NILP (old); |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1627 return Qnil; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1628 } |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1629 |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1630 /* 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
|
1631 information. */ |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1632 |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1633 static void |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1634 end_of_file_error () |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1635 { |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1636 if (STRINGP (Vload_file_name)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1637 xsignal1 (Qend_of_file, Vload_file_name); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1638 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1639 xsignal0 (Qend_of_file); |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1640 } |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
1641 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1642 /* 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
|
1643 for this invocation. |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1644 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
|
1645 |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1646 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
|
1647 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
|
1648 |
341 | 1649 static void |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1650 readevalloop (readcharfun, stream, sourcename, evalfun, |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1651 printflag, unibyte, readfun, start, end) |
341 | 1652 Lisp_Object readcharfun; |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1653 FILE *stream; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1654 Lisp_Object sourcename; |
341 | 1655 Lisp_Object (*evalfun) (); |
1656 int printflag; | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1657 Lisp_Object unibyte, readfun; |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1658 Lisp_Object start, end; |
341 | 1659 { |
1660 register int c; | |
1661 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1662 int count = SPECPDL_INDEX (); |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1663 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
|
1664 struct buffer *b = 0; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1665 int continue_reading_p; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1666 /* Nonzero if reading an entire buffer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1667 int whole_buffer = 0; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1668 /* 1 on the first time around. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1669 int first_sexp = 1; |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1670 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1671 if (MARKERP (readcharfun)) |
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 if (NILP (start)) |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1674 start = readcharfun; |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1675 } |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1676 |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1677 if (BUFFERP (readcharfun)) |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1678 b = XBUFFER (readcharfun); |
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1679 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
|
1680 b = XMARKER (readcharfun)->buffer; |
341 | 1681 |
70595
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1682 /* 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
|
1683 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
|
1684 abort (); |
136d07d2859f
(readevalloop): Abort if START non-nil for non-buffer input.
Richard M. Stallman <rms@gnu.org>
parents:
69170
diff
changeset
|
1685 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1686 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
|
1687 specbind (Qcurrent_load_list, Qnil); |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
1688 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
|
1689 load_convert_to_unibyte = !NILP (unibyte); |
341 | 1690 |
66937
cb58edf068f2
(readevalloop): Add missing GCPROs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66616
diff
changeset
|
1691 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
|
1692 |
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
|
1693 /* 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
|
1694 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
|
1695 && !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
|
1696 && !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
|
1697 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
|
1698 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1699 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
|
1700 |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1701 continue_reading_p = 1; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1702 while (continue_reading_p) |
341 | 1703 { |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1704 int count1 = SPECPDL_INDEX (); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1705 |
5185
52629d087993
(readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents:
5117
diff
changeset
|
1706 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
|
1707 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
|
1708 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1709 if (!NILP (start)) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1710 { |
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
|
1711 /* 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
|
1712 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
|
1713 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
|
1714 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1715 /* 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
|
1716 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
|
1717 /* 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
|
1718 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
|
1719 /* 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
|
1720 |
998f4ca6948d
(readevalloop): Set PT and ZV in the proper buffer, not the current one.
Richard M. Stallman <rms@gnu.org>
parents:
67394
diff
changeset
|
1721 /* 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
|
1722 Fgoto_char (start); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1723 if (!NILP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1724 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
|
1725 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1726 /* 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
|
1727 if it is an integer. */ |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1728 if (INTEGERP (end)) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1729 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
|
1730 } |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1731 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1732 /* 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
|
1733 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
|
1734 if (b && first_sexp) |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1735 whole_buffer = (PT == BEG && ZV == Z); |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1736 |
341 | 1737 instream = stream; |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1738 read_next: |
341 | 1739 c = READCHAR; |
1740 if (c == ';') | |
1741 { | |
1742 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
|
1743 goto read_next; |
341 | 1744 } |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1745 if (c < 0) |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1746 { |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1747 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1748 break; |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1749 } |
10163
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1750 |
70b04b218216
(readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents:
10014
diff
changeset
|
1751 /* 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
|
1752 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
|
1753 || c == 0x8a0) /* NBSP */ |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1754 goto read_next; |
341 | 1755 |
485 | 1756 if (!NILP (Vpurify_flag) && c == '(') |
341 | 1757 { |
1758 record_unwind_protect (unreadpure, Qnil); | |
1759 val = read_list (-1, readcharfun); | |
1760 } | |
1761 else | |
1762 { | |
1763 UNREAD (c); | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1764 read_objects = Qnil; |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1765 if (!NILP (readfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1766 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1767 val = call1 (readfun, readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1768 |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1769 /* 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
|
1770 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
|
1771 to a different value when evaluated. */ |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1772 if (BUFFERP (readcharfun)) |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1773 { |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1774 struct buffer *b = XBUFFER (readcharfun); |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1775 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
|
1776 continue_reading_p = 0; |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1777 } |
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1778 } |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1779 else if (! NILP (Vload_read_function)) |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1780 val = call1 (Vload_read_function, readcharfun); |
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1781 else |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1782 val = read_internal_start (readcharfun, Qnil, Qnil); |
341 | 1783 } |
1784 | |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1785 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
|
1786 start = Fpoint_marker (); |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1787 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1788 /* 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
|
1789 unbind_to (count1, Qnil); |
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1790 |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1791 /* Now eval what we just read. */ |
341 | 1792 val = (*evalfun) (val); |
29486
033cf607b908
(readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents:
29389
diff
changeset
|
1793 |
341 | 1794 if (printflag) |
1795 { | |
1796 Vvalues = Fcons (val, Vvalues); | |
1797 if (EQ (Vstandard_output, Qt)) | |
1798 Fprin1 (val, Qnil); | |
1799 else | |
1800 Fprint (val, Qnil); | |
1801 } | |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1802 |
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1803 first_sexp = 0; |
341 | 1804 } |
1805 | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
1806 build_load_history (sourcename, |
67906
28939487a2d5
(readevalloop): Test for reading a whole buffer
Richard M. Stallman <rms@gnu.org>
parents:
67871
diff
changeset
|
1807 stream || whole_buffer); |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
1808 |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1809 UNGCPRO; |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1810 |
341 | 1811 unbind_to (count, Qnil); |
1812 } | |
1813 | |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1814 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
|
1815 doc: /* Execute the current buffer as Lisp code. |
102465
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1816 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
|
1817 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
|
1818 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
|
1819 PRINTFLAG controls printing of output: |
102465
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1820 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
|
1821 FILENAME specifies the file name to use for `load-history'. |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1822 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
|
1823 invocation. |
245a1f77b840
(Feval_buffer): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102300
diff
changeset
|
1824 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
|
1825 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
|
1826 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1827 This function preserves the position of point. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1828 (buffer, printflag, filename, unibyte, do_allow_print) |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1829 Lisp_Object buffer, printflag, filename, unibyte, do_allow_print; |
672 | 1830 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1831 int count = SPECPDL_INDEX (); |
672 | 1832 Lisp_Object tem, buf; |
1833 | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1834 if (NILP (buffer)) |
672 | 1835 buf = Fcurrent_buffer (); |
1836 else | |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1837 buf = Fget_buffer (buffer); |
673 | 1838 if (NILP (buf)) |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1839 error ("No such buffer"); |
672 | 1840 |
25206
f2c7d7fb6198
(Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents:
25165
diff
changeset
|
1841 if (NILP (printflag) && NILP (do_allow_print)) |
672 | 1842 tem = Qsymbolp; |
1843 else | |
1844 tem = printflag; | |
19803
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1845 |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1846 if (NILP (filename)) |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1847 filename = XBUFFER (buf)->filename; |
7573e51f9c41
(Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents:
19626
diff
changeset
|
1848 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1849 specbind (Qeval_buffer_list, Fcons (buf, Veval_buffer_list)); |
672 | 1850 specbind (Qstandard_output, tem); |
1851 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
|
1852 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
|
1853 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
|
1854 !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
|
1855 unbind_to (count, Qnil); |
672 | 1856 |
1857 return Qnil; | |
1858 } | |
1859 | |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1860 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
|
1861 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
|
1862 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
|
1863 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
|
1864 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
|
1865 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
|
1866 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
|
1867 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
|
1868 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
|
1869 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
|
1870 |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1871 This function does not move point. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1872 (start, end, printflag, read_function) |
22420
cb77a5a6a629
(readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22321
diff
changeset
|
1873 Lisp_Object start, end, printflag, read_function; |
341 | 1874 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45970
diff
changeset
|
1875 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
|
1876 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
|
1877 |
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
1878 cbuf = Fcurrent_buffer (); |
341 | 1879 |
485 | 1880 if (NILP (printflag)) |
341 | 1881 tem = Qsymbolp; |
1882 else | |
1883 tem = printflag; | |
1884 specbind (Qstandard_output, tem); | |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
1885 specbind (Qeval_buffer_list, Fcons (cbuf, Veval_buffer_list)); |
341 | 1886 |
61403
008bb0675c5b
(readevalloop): Add args START and END as region in
Kim F. Storm <storm@cua.dk>
parents:
60069
diff
changeset
|
1887 /* 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
|
1888 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
|
1889 !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
|
1890 start, end); |
341 | 1891 |
1892 return unbind_to (count, Qnil); | |
1893 } | |
1894 | |
1895 | |
1896 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
|
1897 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
|
1898 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
|
1899 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
|
1900 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
|
1901 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
|
1902 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
|
1903 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
|
1904 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
|
1905 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
|
1906 standard input in batch mode). */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1907 (stream) |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1908 Lisp_Object stream; |
341 | 1909 { |
12545
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1910 if (NILP (stream)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1911 stream = Vstandard_input; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1912 if (EQ (stream, Qt)) |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1913 stream = Qread_char; |
ccc20d466150
(Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents:
11955
diff
changeset
|
1914 if (EQ (stream, Qread_char)) |
341 | 1915 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); |
1916 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1917 return read_internal_start (stream, Qnil, Qnil); |
341 | 1918 } |
1919 | |
1920 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
|
1921 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
|
1922 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
|
1923 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
|
1924 they default to 0 and (length STRING) respectively. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
1925 (string, start, end) |
341 | 1926 Lisp_Object string, start, end; |
1927 { | |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1928 Lisp_Object ret; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
1929 CHECK_STRING (string); |
45577
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1930 /* read_internal_start sets read_from_string_index. */ |
30f1ddc50732
Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents:
45576
diff
changeset
|
1931 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
|
1932 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
|
1933 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1934 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1935 /* 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
|
1936 calls. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1937 static Lisp_Object |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1938 read_internal_start (stream, start, end) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1939 Lisp_Object stream; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1940 Lisp_Object start; /* Only used when stream is a string. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1941 Lisp_Object end; /* Only used when stream is a string. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1942 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1943 Lisp_Object retval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1944 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1945 readchar_count = 0; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
1946 new_backquote_flag = 0; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
1947 read_objects = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1948 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1949 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1950 Vread_symbol_positions_list = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1951 |
89483 | 1952 if (STRINGP (stream) |
1953 || ((CONSP (stream) && STRINGP (XCAR (stream))))) | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1954 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1955 int startval, endval; |
89483 | 1956 Lisp_Object string; |
1957 | |
1958 if (STRINGP (stream)) | |
1959 string = stream; | |
1960 else | |
1961 string = XCAR (stream); | |
1962 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1963 if (NILP (end)) |
89483 | 1964 endval = SCHARS (string); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1965 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1966 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1967 CHECK_NUMBER (end); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1968 endval = XINT (end); |
89483 | 1969 if (endval < 0 || endval > SCHARS (string)) |
1970 args_out_of_range (string, end); | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1971 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1972 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1973 if (NILP (start)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1974 startval = 0; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1975 else |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1976 { |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1977 CHECK_NUMBER (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1978 startval = XINT (start); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1979 if (startval < 0 || startval > endval) |
89483 | 1980 args_out_of_range (string, start); |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1981 } |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1982 read_from_string_index = startval; |
89483 | 1983 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
|
1984 read_from_string_limit = endval; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1985 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
1986 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1987 retval = read0 (stream); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1988 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1989 || EQ (Vread_with_symbol_positions, stream)) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
1990 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
|
1991 return retval; |
341 | 1992 } |
1993 | |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1994 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1995 /* Signal Qinvalid_read_syntax error. |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1996 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
|
1997 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1998 static void |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
1999 invalid_syntax (s, n) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2000 const char *s; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2001 int n; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2002 { |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2003 if (!n) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2004 n = strlen (s); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2005 xsignal1 (Qinvalid_read_syntax, make_string (s, n)); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2006 } |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2007 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2008 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2009 /* 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
|
2010 are not allowed. */ |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2011 |
341 | 2012 static Lisp_Object |
2013 read0 (readcharfun) | |
2014 Lisp_Object readcharfun; | |
2015 { | |
2016 register Lisp_Object val; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2017 int c; |
341 | 2018 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2019 val = read1 (readcharfun, &c, 0); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2020 if (!c) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2021 return val; |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2022 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2023 xsignal1 (Qinvalid_read_syntax, |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2024 Fmake_string (make_number (1), make_number (c))); |
341 | 2025 } |
2026 | |
2027 static int read_buffer_size; | |
2028 static char *read_buffer; | |
2029 | |
88886 | 2030 /* Read a \-escape sequence, assuming we already read the `\'. |
89483 | 2031 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
|
2032 |
17038 | 2033 static int |
88886 | 2034 read_escape (readcharfun, stringp) |
341 | 2035 Lisp_Object readcharfun; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2036 int stringp; |
341 | 2037 { |
2038 register int c = READCHAR; | |
104853 | 2039 /* \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
|
2040 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
|
2041 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
|
2042 |
341 | 2043 switch (c) |
2044 { | |
15091
e05dd165b889
(close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents:
14972
diff
changeset
|
2045 case -1: |
40931
50b111aed6d5
(read_escape): Use end_of_file_error for reporting eof.
Richard M. Stallman <rms@gnu.org>
parents:
40796
diff
changeset
|
2046 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
|
2047 |
341 | 2048 case 'a': |
485 | 2049 return '\007'; |
341 | 2050 case 'b': |
2051 return '\b'; | |
2018
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2052 case 'd': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2053 return 0177; |
341 | 2054 case 'e': |
2055 return 033; | |
2056 case 'f': | |
2057 return '\f'; | |
2058 case 'n': | |
2059 return '\n'; | |
2060 case 'r': | |
2061 return '\r'; | |
2062 case 't': | |
2063 return '\t'; | |
2064 case 'v': | |
2065 return '\v'; | |
2066 case '\n': | |
2067 return -1; | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2068 case ' ': |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2069 if (stringp) |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2070 return -1; |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2071 return ' '; |
341 | 2072 |
2073 case 'M': | |
2074 c = READCHAR; | |
2075 if (c != '-') | |
2076 error ("Invalid escape character syntax"); | |
2077 c = READCHAR; | |
2078 if (c == '\\') | |
88886 | 2079 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2080 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
|
2081 |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2082 case 'S': |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2083 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2084 if (c != '-') |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2085 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
|
2086 c = READCHAR; |
7c970ef8949d
(read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents:
1966
diff
changeset
|
2087 if (c == '\\') |
88886 | 2088 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2089 return c | shift_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2090 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2091 case 'H': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2092 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2093 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2094 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2095 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2096 if (c == '\\') |
88886 | 2097 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2098 return c | hyper_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2099 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2100 case 'A': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2101 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2102 if (c != '-') |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2103 error ("Invalid escape character syntax"); |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2104 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2105 if (c == '\\') |
88886 | 2106 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2107 return c | alt_modifier; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2108 |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2109 case 's': |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2110 c = READCHAR; |
80808
d741e1d7761a
(read_escape): In a string, \s is always space.
Richard M. Stallman <rms@gnu.org>
parents:
76777
diff
changeset
|
2111 if (stringp || c != '-') |
67394
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2112 { |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2113 UNREAD (c); |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2114 return ' '; |
f18c2431b06b
(read_escape) <\s>: Don't treat strings specially.
Richard M. Stallman <rms@gnu.org>
parents:
66937
diff
changeset
|
2115 } |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2116 c = READCHAR; |
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2117 if (c == '\\') |
88886 | 2118 c = read_escape (readcharfun, 0); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2119 return c | super_modifier; |
341 | 2120 |
2121 case 'C': | |
2122 c = READCHAR; | |
2123 if (c != '-') | |
2124 error ("Invalid escape character syntax"); | |
2125 case '^': | |
2126 c = READCHAR; | |
2127 if (c == '\\') | |
88886 | 2128 c = read_escape (readcharfun, 0); |
25251
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2129 if ((c & ~CHAR_MODIFIER_MASK) == '?') |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2130 return 0177 | (c & CHAR_MODIFIER_MASK); |
1fb18e7e3f35
(read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents:
25206
diff
changeset
|
2131 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
|
2132 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
|
2133 /* 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
|
2134 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
|
2135 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
|
2136 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
|
2137 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
|
2138 return (c & (037 | ~0177)); |
341 | 2139 else |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
2140 return c | ctrl_modifier; |
341 | 2141 |
2142 case '0': | |
2143 case '1': | |
2144 case '2': | |
2145 case '3': | |
2146 case '4': | |
2147 case '5': | |
2148 case '6': | |
2149 case '7': | |
2150 /* An octal escape, as in ANSI C. */ | |
2151 { | |
2152 register int i = c - '0'; | |
2153 register int count = 0; | |
2154 while (++count < 3) | |
2155 { | |
2156 if ((c = READCHAR) >= '0' && c <= '7') | |
2157 { | |
2158 i *= 8; | |
2159 i += c - '0'; | |
2160 } | |
2161 else | |
2162 { | |
2163 UNREAD (c); | |
2164 break; | |
2165 } | |
2166 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2167 |
89483 | 2168 if (i >= 0x80 && i < 0x100) |
88886 | 2169 i = BYTE8_TO_CHAR (i); |
341 | 2170 return i; |
2171 } | |
2172 | |
2173 case 'x': | |
2174 /* A hex escape, as in ANSI C. */ | |
2175 { | |
2176 int i = 0; | |
88383 | 2177 int count = 0; |
341 | 2178 while (1) |
2179 { | |
2180 c = READCHAR; | |
2181 if (c >= '0' && c <= '9') | |
2182 { | |
2183 i *= 16; | |
2184 i += c - '0'; | |
2185 } | |
2186 else if ((c >= 'a' && c <= 'f') | |
2187 || (c >= 'A' && c <= 'F')) | |
2188 { | |
2189 i *= 16; | |
2190 if (c >= 'a' && c <= 'f') | |
2191 i += c - 'a' + 10; | |
2192 else | |
2193 i += c - 'A' + 10; | |
2194 } | |
2195 else | |
2196 { | |
2197 UNREAD (c); | |
2198 break; | |
2199 } | |
88383 | 2200 count++; |
341 | 2201 } |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2202 |
88383 | 2203 if (count < 3 && i >= 0x80) |
88886 | 2204 return BYTE8_TO_CHAR (i); |
341 | 2205 return i; |
2206 } | |
2207 | |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2208 case 'U': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2209 /* 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
|
2210 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
|
2211 case 'u': |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2212 |
104853 | 2213 /* 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
|
2214 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
|
2215 { |
102300
d7ea9e8841d3
(read_escape): Signal an error for invalid \UXXXXXXXX.
Kenichi Handa <handa@m17n.org>
parents:
102267
diff
changeset
|
2216 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
|
2217 int count = 0; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2218 |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2219 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
|
2220 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2221 c = READCHAR; |
71484
dbe1bcee0357
Fix whitespace of last change.
Eli Zaretskii <eliz@gnu.org>
parents:
71458
diff
changeset
|
2222 /* 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
|
2223 want. */ |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2224 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
|
2225 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
|
2226 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
|
2227 else |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2228 { |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2229 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
|
2230 break; |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2231 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2232 } |
102300
d7ea9e8841d3
(read_escape): Signal an error for invalid \UXXXXXXXX.
Kenichi Handa <handa@m17n.org>
parents:
102267
diff
changeset
|
2233 if (i > 0x10FFFF) |
d7ea9e8841d3
(read_escape): Signal an error for invalid \UXXXXXXXX.
Kenichi Handa <handa@m17n.org>
parents:
102267
diff
changeset
|
2234 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
|
2235 return i; |
71299
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2236 } |
767eeffaf27a
(read_escape): Provide a Unicode character escape syntax; \u followed by
Eli Zaretskii <eliz@gnu.org>
parents:
70880
diff
changeset
|
2237 |
341 | 2238 default: |
2239 return c; | |
2240 } | |
2241 } | |
2242 | |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2243 /* Read an integer in radix RADIX using READCHARFUN to read |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2244 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
|
2245 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
|
2246 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
|
2247 range. */ |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2248 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2249 static Lisp_Object |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2250 read_integer (readcharfun, radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2251 Lisp_Object readcharfun; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2252 int radix; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2253 { |
35543
c809110e1433
(read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents:
34604
diff
changeset
|
2254 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
|
2255 /* 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
|
2256 double number = 0; |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2257 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2258 if (radix < 2 || radix > 36) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2259 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2260 else |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2261 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2262 number = ndigits = invalid_p = 0; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2263 sign = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2264 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2265 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2266 if (c == '-') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2267 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2268 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2269 sign = -1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2270 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2271 else if (c == '+') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2272 c = READCHAR; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2273 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2274 while (c >= 0) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2275 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2276 int digit; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2277 |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2278 if (c >= '0' && c <= '9') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2279 digit = c - '0'; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2280 else if (c >= 'a' && c <= 'z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2281 digit = c - 'a' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2282 else if (c >= 'A' && c <= 'Z') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2283 digit = c - 'A' + 10; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2284 else |
28190
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2285 { |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2286 UNREAD (c); |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2287 break; |
aa79cfcecd73
(read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents:
28165
diff
changeset
|
2288 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2289 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2290 if (digit < 0 || digit >= radix) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2291 invalid_p = 1; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2292 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2293 number = radix * number + digit; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2294 ++ndigits; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2295 c = READCHAR; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2296 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2297 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2298 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2299 if (ndigits == 0 || invalid_p) |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2300 { |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2301 char buf[50]; |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2302 sprintf (buf, "integer, radix %d", radix); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2303 invalid_syntax (buf, 0); |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2304 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2305 |
104658
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
2306 return make_fixnum_or_float (sign * number); |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2307 } |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2308 |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2309 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2310 /* 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
|
2311 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
|
2312 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
|
2313 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2314 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
|
2315 |
341 | 2316 static Lisp_Object |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2317 read1 (readcharfun, pch, first_in_list) |
341 | 2318 register Lisp_Object readcharfun; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2319 int *pch; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2320 int first_in_list; |
341 | 2321 { |
2322 register int c; | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2323 int uninterned_symbol = 0; |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2324 int multibyte; |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2325 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2326 *pch = 0; |
88886 | 2327 load_each_byte = 0; |
341 | 2328 |
2329 retry: | |
2330 | |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2331 c = READCHAR_REPORT_MULTIBYTE (&multibyte); |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2332 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2333 end_of_file_error (); |
341 | 2334 |
2335 switch (c) | |
2336 { | |
2337 case '(': | |
2338 return read_list (0, readcharfun); | |
2339 | |
2340 case '[': | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2341 return read_vector (readcharfun, 0); |
341 | 2342 |
2343 case ')': | |
2344 case ']': | |
2345 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2346 *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
|
2347 return Qnil; |
341 | 2348 } |
2349 | |
2350 case '#': | |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2351 c = READCHAR; |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2352 if (c == 's') |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2353 { |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2354 c = READCHAR; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2355 if (c == '(') |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2356 { |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2357 /* 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
|
2358 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
|
2359 #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
|
2360 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
|
2361 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
|
2362 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
|
2363 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
|
2364 /* 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
|
2365 make-hash-table. */ |
104853 | 2366 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
|
2367 Lisp_Object ht; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2368 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
|
2369 int param_count = 0; |
104853 | 2370 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2371 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
|
2372 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
|
2373 "(only hash-table allowed)"); |
104853 | 2374 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2375 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
|
2376 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2377 /* 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
|
2378 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
|
2379 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
|
2380 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
|
2381 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
|
2382 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2383 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
|
2384 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
|
2385 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
|
2386 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
|
2387 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2388 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
|
2389 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
|
2390 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
|
2391 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
|
2392 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2393 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
|
2394 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
|
2395 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
|
2396 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
|
2397 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2398 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
|
2399 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
|
2400 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
|
2401 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
|
2402 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2403 /* 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
|
2404 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
|
2405 |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2406 /* 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
|
2407 ht = Fmake_hash_table (param_count, params); |
104853 | 2408 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2409 while (CONSP (data)) |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2410 { |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2411 key = XCAR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2412 data = XCDR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2413 if (!CONSP (data)) |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2414 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
|
2415 val = XCAR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2416 data = XCDR (data); |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2417 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
|
2418 } |
104853 | 2419 |
104162
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2420 return ht; |
d4c5482e3aa4
* lread.c (read1, syms_of_lread): Read hashtables back from the
Teodor Zlatanov <tzz@lifelogs.com>
parents:
104064
diff
changeset
|
2421 } |
109271
de58fd0baac5
* lread.c (read1): Signal error if #s is not followed by paren.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106949
diff
changeset
|
2422 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
|
2423 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
|
2424 } |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2425 if (c == '^') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2426 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2427 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2428 if (c == '[') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2429 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
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, 0); |
90830
e33fffaa9534
(read1): Use CHAR_TABLE_STANDARD_SLOTS to validate
Andreas Schwab <schwab@suse.de>
parents:
90796
diff
changeset
|
2432 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
|
2433 error ("Invalid size char-table"); |
85356
689fd5665496
(read1): Set pvectype for char_tables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85330
diff
changeset
|
2434 XSETPVECTYPE (XVECTOR (tmp), PVEC_CHAR_TABLE); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2435 return tmp; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2436 } |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2437 else if (c == '^') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2438 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2439 c = READCHAR; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2440 if (c == '[') |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2441 { |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2442 Lisp_Object tmp; |
88383 | 2443 int depth, size; |
89483 | 2444 |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2445 tmp = read_vector (readcharfun, 0); |
88383 | 2446 if (!INTEGERP (AREF (tmp, 0))) |
2447 error ("Invalid depth in char-table"); | |
2448 depth = XINT (AREF (tmp, 0)); | |
2449 if (depth < 1 || depth > 3) | |
2450 error ("Invalid depth in char-table"); | |
89996
d13df8a735d7
(read1): Fix reading of a char-table.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2451 size = XVECTOR (tmp)->size - 2; |
88383 | 2452 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
|
2453 error ("Invalid size char-table"); |
91046 | 2454 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
|
2455 return tmp; |
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2456 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2457 invalid_syntax ("#^^", 3); |
17325
c19c552c486f
(read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17125
diff
changeset
|
2458 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2459 invalid_syntax ("#^", 2); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2460 } |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2461 if (c == '&') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2462 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2463 Lisp_Object length; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2464 length = read1 (readcharfun, pch, first_in_list); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2465 c = READCHAR; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2466 if (c == '"') |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2467 { |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2468 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
|
2469 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
|
2470 = ((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
|
2471 / BOOL_VECTOR_BITS_PER_CHAR); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2472 |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2473 UNREAD (c); |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2474 tmp = read1 (readcharfun, pch, first_in_list); |
88886 | 2475 if (STRING_MULTIBYTE (tmp) |
89483 | 2476 || (size_in_chars != SCHARS (tmp) |
88886 | 2477 /* We used to print 1 char too many |
2478 when the number of bits was a multiple of 8. | |
2479 Accept such input in case it came from an old | |
2480 version. */ | |
2481 && ! (XFASTINT (length) | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2482 == (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
|
2483 invalid_syntax ("#&...", 5); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2484 |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2485 val = Fmake_bool_vector (length, Qnil); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2486 bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data, |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2487 size_in_chars); |
21935
8dad06385435
(read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents:
21911
diff
changeset
|
2488 /* 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
|
2489 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
|
2490 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
|
2491 &= (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
|
2492 return val; |
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2493 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2494 invalid_syntax ("#&...", 5); |
13146
6182d95acd14
(read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents:
13036
diff
changeset
|
2495 } |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2496 if (c == '[') |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2497 { |
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2498 /* 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
|
2499 build them using function calls. */ |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2500 Lisp_Object tmp; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2501 tmp = read_vector (readcharfun, 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2502 return Fmake_byte_code (XVECTOR (tmp)->size, |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2503 XVECTOR (tmp)->contents); |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2504 } |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2505 if (c == '(') |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2506 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2507 Lisp_Object tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2508 struct gcpro gcpro1; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
2509 int ch; |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2510 |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2511 /* 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
|
2512 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
|
2513 if (ch != 0 || !STRINGP (tmp)) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2514 invalid_syntax ("#", 1); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2515 GCPRO1 (tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2516 /* Read the intervals and their properties. */ |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2517 while (1) |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2518 { |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2519 Lisp_Object beg, end, plist; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2520 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2521 beg = read1 (readcharfun, &ch, 0); |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
2522 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
|
2523 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
|
2524 break; |
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2525 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2526 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
|
2527 if (ch == 0) |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2528 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
|
2529 if (ch) |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2530 invalid_syntax ("Invalid string property list", 0); |
1966
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2531 Fset_text_properties (beg, end, plist, tmp); |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2532 } |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2533 UNGCPRO; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2534 return tmp; |
bcc34323a475
(read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents:
1924
diff
changeset
|
2535 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2536 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2537 /* #@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
|
2538 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
|
2539 and function definitions. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2540 if (c == '@') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2541 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2542 int i, nskip = 0; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2543 |
88886 | 2544 load_each_byte = 1; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2545 /* Read a decimal integer. */ |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2546 while ((c = READCHAR) >= 0 |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2547 && c >= '0' && c <= '9') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2548 { |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2549 nskip *= 10; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2550 nskip += c - '0'; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2551 } |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2552 if (c >= 0) |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2553 UNREAD (c); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2554 |
88886 | 2555 if (load_force_doc_strings |
2556 && (EQ (readcharfun, Qget_file_char) | |
2557 || EQ (readcharfun, Qget_emacs_mule_file_char))) | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2558 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2559 /* 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
|
2560 record the last string that we skipped, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2561 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
|
2562 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2563 /* But first exchange saved_doc_string |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2564 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
|
2565 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2566 char *temp = saved_doc_string; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2567 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
|
2568 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
|
2569 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
|
2570 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2571 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
|
2572 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
|
2573 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
|
2574 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
|
2575 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2576 prev_saved_doc_string = temp; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2577 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
|
2578 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
|
2579 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
|
2580 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
2581 |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2582 if (saved_doc_string_size == 0) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2583 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2584 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
|
2585 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
|
2586 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2587 if (nskip > saved_doc_string_size) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2588 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2589 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
|
2590 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
|
2591 saved_doc_string_size); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2592 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2593 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26072
diff
changeset
|
2594 saved_doc_string_position = file_tell (instream); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2595 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2596 /* Copy that many characters into saved_doc_string. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2597 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2598 saved_doc_string[i] = c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2599 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2600 saved_doc_string_length = i; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2601 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2602 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2603 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2604 /* Skip that many characters. */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2605 for (i = 0; i < nskip && c >= 0; i++) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2606 c = READCHAR; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
2607 } |
20048
5324d8b2322b
(read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents:
20024
diff
changeset
|
2608 |
88886 | 2609 load_each_byte = 0; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2610 goto retry; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2611 } |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2612 if (c == '!') |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2613 { |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2614 /* #! 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
|
2615 Skip the first line. */ |
50138
75ed0f4a2f18
(read1): After #!, exit loop on eof.
Richard M. Stallman <rms@gnu.org>
parents:
49979
diff
changeset
|
2616 while (c != '\n' && c >= 0) |
47184
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2617 c = READCHAR; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2618 goto retry; |
04a4d5eda995
(read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents:
47021
diff
changeset
|
2619 } |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2620 if (c == '$') |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
2621 return Vload_file_name; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2622 if (c == '\'') |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2623 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
|
2624 /* #: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
|
2625 if (c == ':') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2626 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2627 uninterned_symbol = 1; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2628 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2629 goto default_label; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2630 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2631 /* 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
|
2632 if (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2633 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2634 int n = 0; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2635 Lisp_Object tem; |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
2636 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2637 /* Read a non-negative integer. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2638 while (c >= '0' && c <= '9') |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2639 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2640 n *= 10; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2641 n += c - '0'; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2642 c = READCHAR; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2643 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2644 /* #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
|
2645 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
|
2646 { |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2647 /* 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
|
2648 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2649 Lisp_Object cell; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2650 |
104853 | 2651 placeholder = Fcons (Qnil, Qnil); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2652 cell = Fcons (make_number (n), placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2653 read_objects = Fcons (cell, read_objects); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2654 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2655 /* Read the object itself. */ |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2656 tem = read0 (readcharfun); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2657 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2658 /* 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
|
2659 substitute_object_in_subtree (tem, placeholder); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2660 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
2661 /* ...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
|
2662 Fsetcdr (cell, tem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2663 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2664 return tem; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2665 } |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2666 /* #n# returns a previously read object. */ |
103101
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
2667 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
|
2668 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2669 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
|
2670 if (CONSP (tem)) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2671 return XCDR (tem); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2672 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2673 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2674 else if (c == 'r' || c == 'R') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2675 return read_integer (readcharfun, n); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2676 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2677 /* Fall through to error message. */ |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2678 } |
28165
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2679 else if (c == 'x' || c == 'X') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2680 return read_integer (readcharfun, 16); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2681 else if (c == 'o' || c == 'O') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2682 return read_integer (readcharfun, 8); |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2683 else if (c == 'b' || c == 'B') |
9a61aec440a7
(read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28156
diff
changeset
|
2684 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
|
2685 |
373
7c6f74ef31a3
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
364
diff
changeset
|
2686 UNREAD (c); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2687 invalid_syntax ("#", 1); |
341 | 2688 |
2689 case ';': | |
2690 while ((c = READCHAR) >= 0 && c != '\n'); | |
2691 goto retry; | |
2692 | |
2693 case '\'': | |
2694 { | |
2695 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil)); | |
2696 } | |
2697 | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2698 case '`': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2699 if (first_in_list) |
78612
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2700 { |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2701 Vold_style_backquotes = Qt; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2702 goto default_label; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2703 } |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2704 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2705 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2706 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2707 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2708 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2709 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2710 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2711 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2712 return Fcons (Qbackquote, Fcons (value, Qnil)); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2713 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2714 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2715 case ',': |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2716 if (new_backquote_flag) |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2717 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2718 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
|
2719 Lisp_Object value; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2720 int ch = READCHAR; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2721 |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2722 if (ch == '@') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2723 comma_type = Qcomma_at; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2724 else if (ch == '.') |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2725 comma_type = Qcomma_dot; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2726 else |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2727 { |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2728 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
|
2729 comma_type = Qcomma; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2730 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2731 |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2732 new_backquote_flag--; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2733 value = read0 (readcharfun); |
40784
d57f74c55909
(read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40690
diff
changeset
|
2734 new_backquote_flag++; |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2735 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
|
2736 } |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2737 else |
78612
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2738 { |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2739 Vold_style_backquotes = Qt; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2740 goto default_label; |
6afa3ea6e4da
(Vold_style_backquotes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
2741 } |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2742 |
341 | 2743 case '?': |
2744 { | |
88886 | 2745 int modifiers; |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2746 int next_char; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2747 int ok; |
42424
87b4443a330e
(read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2748 |
341 | 2749 c = READCHAR; |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2750 if (c < 0) |
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2751 end_of_file_error (); |
341 | 2752 |
49979
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2753 /* 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
|
2754 whitespace character is SPC or TAB. |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2755 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
|
2756 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
|
2757 if (c == ' ' || c == '\t') |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2758 return make_number (c); |
975bc8dd3172
(read1): Accept `single space' syntax like (? x).
Kim F. Storm <storm@cua.dk>
parents:
49908
diff
changeset
|
2759 |
341 | 2760 if (c == '\\') |
88886 | 2761 c = read_escape (readcharfun, 0); |
2762 modifiers = c & CHAR_MODIFIER_MASK; | |
2763 c &= ~CHAR_MODIFIER_MASK; | |
2764 if (CHAR_BYTE8_P (c)) | |
2765 c = CHAR_TO_BYTE8 (c); | |
2766 c |= modifiers; | |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2767 |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2768 next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2769 if (next_char == '.') |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2770 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2771 /* 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
|
2772 int next_next_char = READCHAR; |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2773 UNREAD (next_next_char); |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2774 |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2775 ok = (next_next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2776 || (next_next_char < 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2777 && (index ("\"';([#?", next_next_char) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2778 || (!first_in_list && next_next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2779 || (new_backquote_flag && next_next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2780 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2781 else |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2782 { |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2783 ok = (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2784 || (next_char < 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2785 && (index ("\"';()[]#?", next_char) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2786 || (!first_in_list && next_char == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2787 || (new_backquote_flag && next_char == ',')))); |
49831
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2788 } |
3df99c93b6a4
(read1): Fix and relax read syntax.
Kim F. Storm <storm@cua.dk>
parents:
49765
diff
changeset
|
2789 UNREAD (next_char); |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2790 if (ok) |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2791 return make_number (c); |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2792 |
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
2793 invalid_syntax ("?", 1); |
341 | 2794 } |
2795 | |
22103
cbec85828fad
(readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents:
21982
diff
changeset
|
2796 case '"': |
341 | 2797 { |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2798 char *p = read_buffer; |
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2799 char *end = read_buffer + read_buffer_size; |
341 | 2800 register int c; |
88383 | 2801 /* Nonzero if we saw an escape sequence specifying |
2802 a multibyte character. */ | |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2803 int force_multibyte = 0; |
88383 | 2804 /* 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
|
2805 a single-byte character. */ |
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2806 int force_singlebyte = 0; |
341 | 2807 int cancel = 0; |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2808 int nchars = 0; |
341 | 2809 |
2810 while ((c = READCHAR) >= 0 | |
2811 && c != '\"') | |
2812 { | |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2813 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2814 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2815 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2816 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
|
2817 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2818 p = read_buffer + offset; |
341 | 2819 end = read_buffer + read_buffer_size; |
2820 } | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2821 |
341 | 2822 if (c == '\\') |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2823 { |
88383 | 2824 int modifiers; |
88886 | 2825 |
2826 c = read_escape (readcharfun, 1); | |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2827 |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2828 /* 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
|
2829 if (c == -1) |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2830 { |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2831 if (p == read_buffer) |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2832 cancel = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2833 continue; |
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2834 } |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2835 |
88383 | 2836 modifiers = c & CHAR_MODIFIER_MASK; |
2837 c = c & ~CHAR_MODIFIER_MASK; | |
2838 | |
88886 | 2839 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
|
2840 force_singlebyte = 1; |
88886 | 2841 else if (! ASCII_CHAR_P (c)) |
2842 force_multibyte = 1; | |
2843 else /* i.e. ASCII_CHAR_P (c) */ | |
88383 | 2844 { |
2845 /* Allow `\C- ' and `\C-?'. */ | |
2846 if (modifiers == CHAR_CTL) | |
2847 { | |
2848 if (c == ' ') | |
2849 c = 0, modifiers = 0; | |
2850 else if (c == '?') | |
2851 c = 127, modifiers = 0; | |
2852 } | |
2853 if (modifiers & CHAR_SHIFT) | |
2854 { | |
2855 /* Shift modifier is valid only with [A-Za-z]. */ | |
2856 if (c >= 'A' && c <= 'Z') | |
2857 modifiers &= ~CHAR_SHIFT; | |
2858 else if (c >= 'a' && c <= 'z') | |
2859 c -= ('a' - 'A'), modifiers &= ~CHAR_SHIFT; | |
2860 } | |
2861 | |
2862 if (modifiers & CHAR_META) | |
2863 { | |
2864 /* Move the meta bit to the right place for a | |
2865 string. */ | |
2866 modifiers &= ~CHAR_META; | |
2867 c = BYTE8_TO_CHAR (c | 0x80); | |
2868 force_singlebyte = 1; | |
2869 } | |
2870 } | |
2871 | |
2872 /* Any modifiers remaining are invalid. */ | |
2873 if (modifiers) | |
2874 error ("Invalid modifier in string"); | |
2875 p += CHAR_STRING (c, (unsigned char *) p); | |
341 | 2876 } |
88886 | 2877 else |
6470
651b49e52c9e
(read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents:
6392
diff
changeset
|
2878 { |
88383 | 2879 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
|
2880 if (CHAR_BYTE8_P (c)) |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2881 force_singlebyte = 1; |
85b37317d5ea
(read1): While reading a string, set force_singlebyte
Kenichi Handa <handa@m17n.org>
parents:
89417
diff
changeset
|
2882 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
|
2883 force_multibyte = 1; |
19240
c962562027d4
(read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents:
19115
diff
changeset
|
2884 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2885 nchars++; |
341 | 2886 } |
43080
a6382f0fcb2a
(read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents:
42797
diff
changeset
|
2887 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2888 if (c < 0) |
28733
3234d64a07bf
(end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28633
diff
changeset
|
2889 end_of_file_error (); |
341 | 2890 |
2891 /* If purifying, and string starts with \ newline, | |
2892 return zero instead. This is for doc strings | |
604 | 2893 that we are really going to find in etc/DOC.nn.nn */ |
485 | 2894 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) |
341 | 2895 return make_number (0); |
2896 | |
88383 | 2897 if (force_multibyte) |
2898 /* 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
|
2899 ; |
88383 | 2900 else if (force_singlebyte) |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
2901 { |
88383 | 2902 nchars = str_as_unibyte (read_buffer, p - read_buffer); |
2903 p = read_buffer + nchars; | |
40503
8f64b39c2a12
(to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
40211
diff
changeset
|
2904 } |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2905 else |
88383 | 2906 /* 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
|
2907 ; |
20669
fa76057543dd
(read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents:
20609
diff
changeset
|
2908 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2909 /* 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
|
2910 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
|
2911 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
|
2912 READCHAR *does* read multibyte characters from buffers. */ |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
2913 /* readchar_count -= (p - read_buffer) - nchars; */ |
341 | 2914 if (read_pure) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2915 return make_pure_string (read_buffer, nchars, p - read_buffer, |
88383 | 2916 (force_multibyte |
2917 || (p - read_buffer != nchars))); | |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
2918 return make_specified_string (read_buffer, nchars, p - read_buffer, |
88383 | 2919 (force_multibyte |
2920 || (p - read_buffer != nchars))); | |
341 | 2921 } |
2922 | |
762 | 2923 case '.': |
2924 { | |
2925 int next_char = READCHAR; | |
2926 UNREAD (next_char); | |
2927 | |
28746
42f2ded9d9db
(read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents:
28733
diff
changeset
|
2928 if (next_char <= 040 |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2929 || (next_char < 0200 |
58093
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2930 && (index ("\"';([#?", next_char) |
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2931 || (!first_in_list && next_char == '`') |
a65f6f256839
(read1): Fix next_char matching.
Kim F. Storm <storm@cua.dk>
parents:
55158
diff
changeset
|
2932 || (new_backquote_flag && next_char == ',')))) |
762 | 2933 { |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
2934 *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
|
2935 return Qnil; |
762 | 2936 } |
2937 | |
2938 /* Otherwise, we fall through! Note that the atom-reading loop | |
2939 below will now loop at least once, assuring that we will not | |
2940 try to UNREAD two characters in a row. */ | |
2941 } | |
341 | 2942 default: |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
2943 default_label: |
341 | 2944 if (c <= 040) goto retry; |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2945 if (c == 0x8a0) /* NBSP */ |
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2946 goto retry; |
341 | 2947 { |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2948 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
|
2949 int quoted = 0; |
341 | 2950 |
2951 { | |
31315
08bb5394dee1
(read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents:
31307
diff
changeset
|
2952 char *end = read_buffer + read_buffer_size; |
341 | 2953 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2954 while (c > 040 |
82214
7fa775bf0fd4
(readevalloop, read1): Treat NBSP as whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
2955 && c != 0x8a0 /* NBSP */ |
50513
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2956 && (c >= 0200 |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2957 || (!index ("\"';()[]#", c) |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2958 && !(!first_in_list && c == '`') |
b83d48b25b9b
(read1): Before calling index, check if the 2nd
Kenichi Handa <handa@m17n.org>
parents:
50492
diff
changeset
|
2959 && !(new_backquote_flag && c == ',')))) |
341 | 2960 { |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2961 if (end - p < MAX_MULTIBYTE_LENGTH) |
341 | 2962 { |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2963 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2964 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
|
2965 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2966 p = read_buffer + offset; |
341 | 2967 end = read_buffer + read_buffer_size; |
2968 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
2969 |
341 | 2970 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
|
2971 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
2972 c = READCHAR; |
34604
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2973 if (c == -1) |
e2ad3c71947b
(read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents:
34428
diff
changeset
|
2974 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
|
2975 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
|
2976 } |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
2977 |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
2978 if (multibyte) |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
2979 p += CHAR_STRING (c, p); |
21724
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2980 else |
12a826a37249
(read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21677
diff
changeset
|
2981 *p++ = c; |
341 | 2982 c = READCHAR; |
2983 } | |
2984 | |
2985 if (p == end) | |
2986 { | |
34362
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2987 int offset = p - read_buffer; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2988 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
|
2989 read_buffer_size *= 2); |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2990 p = read_buffer + offset; |
020c1a0abaf6
(read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents:
33570
diff
changeset
|
2991 end = read_buffer + read_buffer_size; |
341 | 2992 } |
2993 *p = 0; | |
2994 if (c >= 0) | |
2995 UNREAD (c); | |
2996 } | |
2997 | |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
2998 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
|
2999 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
3000 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
|
3001 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
|
3002 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
|
3003 /* 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
|
3004 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
|
3005 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
3006 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
|
3007 /* 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
|
3008 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
|
3009 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
|
3010 /* 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
|
3011 { |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
3012 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
|
3013 p1[-1] = '\0'; |
104658
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3014 { |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3015 /* 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
|
3016 char *endptr = NULL; |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3017 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
|
3018 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
|
3019 if (errno == ERANGE && endptr) |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3020 { |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3021 Lisp_Object args |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3022 = 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
|
3023 endptr - read_buffer), |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3024 Qnil); |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3025 xsignal (Qoverflow_error, args); |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3026 } |
7b5e19f7e726
(read_integer): Use doubles (and potentially return a float
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104162
diff
changeset
|
3027 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
|
3028 } |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
3029 } |
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
3030 } |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
3031 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
|
3032 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3033 /* 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
|
3034 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
|
3035 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
|
3036 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
|
3037 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3038 double value; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3039 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3040 /* 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
|
3041 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
|
3042 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
|
3043 drops the sign. */ |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3044 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
|
3045 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3046 /* 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
|
3047 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
|
3048 switch (p[-1]) |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3049 { |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3050 case 'F': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3051 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
|
3052 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3053 case 'N': |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3054 value = zero / zero; |
63755
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3055 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3056 /* 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
|
3057 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3058 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3059 int i; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3060 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
|
3061 |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3062 u_data.d = value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3063 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
|
3064 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
|
3065 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
|
3066 { |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3067 value = - value; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3068 break; |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3069 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3070 } |
36bd1972ba30
(read1): 0.0e+NaN should make a "positive" NaN.
Richard M. Stallman <rms@gnu.org>
parents:
63699
diff
changeset
|
3071 /* 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
|
3072 break; |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3073 default: |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3074 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
|
3075 break; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3076 } |
23159
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3077 |
b468525b44b8
(read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents:
23056
diff
changeset
|
3078 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
|
3079 } |
5017
9c277d938ccd
(read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents:
4701
diff
changeset
|
3080 } |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3081 { |
91185
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3082 Lisp_Object name, result; |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3083 EMACS_INT nbytes = p - read_buffer; |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3084 EMACS_INT nchars |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3085 = (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
|
3086 : nbytes); |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3087 |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3088 if (uninterned_symbol && ! NILP (Vpurify_flag)) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3089 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
|
3090 else |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3091 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
|
3092 result = (uninterned_symbol ? Fmake_symbol (name) |
62752a838b86
(read1): Redo the previous change with checking
Kenichi Handa <handa@m17n.org>
parents:
91121
diff
changeset
|
3093 : Fintern (name, Qnil)); |
91093
3de299ab846c
(READCHAR): Call readchar with the 2nd arg NULL.
Kenichi Handa <handa@m17n.org>
parents:
91056
diff
changeset
|
3094 |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3095 if (EQ (Vread_with_symbol_positions, Qt) |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3096 || EQ (Vread_with_symbol_positions, readcharfun)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3097 Vread_symbol_positions_list = |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3098 /* 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
|
3099 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
|
3100 deal, though. */ |
45747
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3101 Fcons (Fcons (result, |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3102 make_number (readchar_count |
2049fa380cb1
(read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45577
diff
changeset
|
3103 - XFASTINT (Flength (Fsymbol_name (result))))), |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3104 Vread_symbol_positions_list); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3105 return result; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
3106 } |
341 | 3107 } |
3108 } | |
3109 } | |
3110 | |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3111 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3112 /* 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
|
3113 static Lisp_Object seen_list; |
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 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3116 substitute_object_in_subtree (object, placeholder) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3117 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3118 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3119 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3120 Lisp_Object check_object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3121 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3122 /* 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
|
3123 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3124 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3125 /* Make all the substitutions. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3126 check_object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3127 = substitute_object_recurse (object, placeholder, object); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3128 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3129 /* 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
|
3130 seen_list = Qnil; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3131 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3132 /* 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
|
3133 original. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3134 if (!EQ (check_object, object)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3135 error ("Unexpected mutation error in reader"); |
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 /* 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
|
3139 #define SUBSTITUTE(get_val, set_val) \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3140 do { \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3141 Lisp_Object old_value = get_val; \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3142 Lisp_Object true_value \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3143 = substitute_object_recurse (object, placeholder, \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3144 old_value); \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3145 \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3146 if (!EQ (old_value, true_value)) \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3147 { \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3148 set_val; \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3149 } \ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3150 } while (0) |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3151 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3152 static Lisp_Object |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3153 substitute_object_recurse (object, placeholder, subtree) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3154 Lisp_Object object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3155 Lisp_Object placeholder; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3156 Lisp_Object subtree; |
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 /* 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
|
3159 if (EQ (placeholder, subtree)) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3160 return object; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3161 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3162 /* 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
|
3163 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
|
3164 return subtree; |
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 /* 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
|
3167 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
|
3168 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
|
3169 read_objects. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3170 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
|
3171 seen_list = Fcons (subtree, seen_list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3172 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3173 /* Recurse according to subtree's type. |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3174 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
|
3175 switch (XTYPE (subtree)) |
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 case Lisp_Vectorlike: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3178 { |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3179 int i, length = 0; |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3180 if (BOOL_VECTOR_P (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3181 return subtree; /* No sub-objects anyway. */ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3182 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
|
3183 || COMPILEDP (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3184 length = ASIZE (subtree) & PSEUDOVECTOR_SIZE_MASK; |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3185 else if (VECTORP (subtree)) |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3186 length = ASIZE (subtree); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3187 else |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3188 /* 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
|
3189 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
|
3190 `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
|
3191 behavior. */ |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3192 wrong_type_argument (Qsequencep, subtree); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3193 |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3194 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
|
3195 SUBSTITUTE (AREF (subtree, i), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3196 ASET (subtree, i, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3197 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3198 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3199 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3200 case Lisp_Cons: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3201 { |
94696
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3202 SUBSTITUTE (XCAR (subtree), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3203 XSETCAR (subtree, true_value)); |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3204 SUBSTITUTE (XCDR (subtree), |
c522dff11548
(substitute_object_recurse): Use lower-level primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93110
diff
changeset
|
3205 XSETCDR (subtree, true_value)); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3206 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3207 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3208 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3209 case Lisp_String: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3210 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3211 /* 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
|
3212 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
|
3213 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3214 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
|
3215 Lisp_Object arg = Fcons (object, placeholder); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3216 |
39857
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3217 traverse_intervals_noorder (root_interval, |
6235c0f8e52c
(substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39816
diff
changeset
|
3218 &substitute_in_interval, arg); |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3219 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3220 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3221 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3222 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3223 /* 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
|
3224 default: |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3225 return subtree; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3226 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3227 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3228 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3229 /* Helper function for substitute_object_recurse. */ |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3230 static void |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3231 substitute_in_interval (interval, arg) |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3232 INTERVAL interval; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3233 Lisp_Object arg; |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3234 { |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3235 Lisp_Object object = Fcar (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3236 Lisp_Object placeholder = Fcdr (arg); |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3237 |
104853 | 3238 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
|
3239 } |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3240 |
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
3241 |
341 | 3242 #define LEAD_INT 1 |
3243 #define DOT_CHAR 2 | |
3244 #define TRAIL_INT 4 | |
3245 #define E_CHAR 8 | |
3246 #define EXP_INT 16 | |
3247 | |
3248 int | |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
3249 isfloat_string (cp, ignore_trailing) |
341 | 3250 register char *cp; |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
3251 int ignore_trailing; |
341 | 3252 { |
21799 | 3253 register int state; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3254 |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3255 char *start = cp; |
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3256 |
341 | 3257 state = 0; |
3258 if (*cp == '+' || *cp == '-') | |
3259 cp++; | |
3260 | |
9871 | 3261 if (*cp >= '0' && *cp <= '9') |
341 | 3262 { |
3263 state |= LEAD_INT; | |
9871 | 3264 while (*cp >= '0' && *cp <= '9') |
3265 cp++; | |
341 | 3266 } |
3267 if (*cp == '.') | |
3268 { | |
3269 state |= DOT_CHAR; | |
3270 cp++; | |
3271 } | |
9871 | 3272 if (*cp >= '0' && *cp <= '9') |
341 | 3273 { |
3274 state |= TRAIL_INT; | |
9871 | 3275 while (*cp >= '0' && *cp <= '9') |
341 | 3276 cp++; |
3277 } | |
16342
b91af71f45f1
(isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents:
16228
diff
changeset
|
3278 if (*cp == 'e' || *cp == 'E') |
341 | 3279 { |
3280 state |= E_CHAR; | |
3281 cp++; | |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3282 if (*cp == '+' || *cp == '-') |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
3283 cp++; |
341 | 3284 } |
3285 | |
9871 | 3286 if (*cp >= '0' && *cp <= '9') |
341 | 3287 { |
3288 state |= EXP_INT; | |
9871 | 3289 while (*cp >= '0' && *cp <= '9') |
341 | 3290 cp++; |
3291 } | |
21911
8087931b409e
(isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents:
21799
diff
changeset
|
3292 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
|
3293 ; |
20815
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3294 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
|
3295 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3296 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3297 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3298 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3299 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
|
3300 { |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3301 state |= EXP_INT; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3302 cp += 3; |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3303 } |
d5ae7491d2b0
(read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents:
20773
diff
changeset
|
3304 |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
3305 return ((ignore_trailing |
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
3306 || (*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) |
341 | 3307 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) |
826 | 3308 || state == (DOT_CHAR|TRAIL_INT) |
341 | 3309 || state == (LEAD_INT|E_CHAR|EXP_INT) |
826 | 3310 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT) |
3311 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT))); | |
341 | 3312 } |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27645
diff
changeset
|
3313 |
341 | 3314 |
3315 static Lisp_Object | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3316 read_vector (readcharfun, bytecodeflag) |
341 | 3317 Lisp_Object readcharfun; |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3318 int bytecodeflag; |
341 | 3319 { |
3320 register int i; | |
3321 register int size; | |
3322 register Lisp_Object *ptr; | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3323 register Lisp_Object tem, item, vector; |
341 | 3324 register struct Lisp_Cons *otem; |
3325 Lisp_Object len; | |
3326 | |
3327 tem = read_list (1, readcharfun); | |
3328 len = Flength (tem); | |
3329 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil)); | |
3330 | |
3331 size = XVECTOR (vector)->size; | |
3332 ptr = XVECTOR (vector)->contents; | |
3333 for (i = 0; i < size; i++) | |
3334 { | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3335 item = Fcar (tem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3336 /* 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
|
3337 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
|
3338 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
|
3339 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
|
3340 if (bytecodeflag && load_force_doc_strings) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3341 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3342 if (i == COMPILED_BYTECODE) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3343 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3344 if (!STRINGP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3345 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3346 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3347 /* 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
|
3348 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
|
3349 constants slot is nil). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3350 ptr[COMPILED_CONSTANTS] = item; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3351 item = Qnil; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3352 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3353 else if (i == COMPILED_CONSTANTS) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3354 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3355 Lisp_Object bytestr = ptr[COMPILED_CONSTANTS]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3356 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3357 if (NILP (item)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3358 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3359 /* 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
|
3360 but without generating extra garbage and |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3361 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
|
3362 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
|
3363 STRING_SET_UNIBYTE (bytestr); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3364 |
88886 | 3365 item = Fread (Fcons (bytestr, readcharfun)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3366 if (!CONSP (item)) |
63699
4089414d3208
(read_vector): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
62116
diff
changeset
|
3367 error ("Invalid byte code"); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3368 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3369 otem = XCONS (item); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3370 bytestr = XCAR (item); |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3371 item = XCDR (item); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3372 free_cons (otem); |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3373 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3374 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3375 /* Now handle the bytecode slot. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3376 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
|
3377 } |
88886 | 3378 else if (i == COMPILED_DOC_STRING |
3379 && STRINGP (item) | |
3380 && ! STRING_MULTIBYTE (item)) | |
3381 { | |
3382 if (EQ (readcharfun, Qget_emacs_mule_file_char)) | |
3383 item = Fdecode_coding_string (item, Qemacs_mule, Qnil, Qnil); | |
3384 else | |
3385 item = Fstring_as_multibyte (item); | |
3386 } | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3387 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3388 ptr[i] = read_pure ? Fpurecopy (item) : item; |
341 | 3389 otem = XCONS (tem); |
3390 tem = Fcdr (tem); | |
3391 free_cons (otem); | |
3392 } | |
3393 return vector; | |
3394 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3395 |
20548
e9733cb049d9
(readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20406
diff
changeset
|
3396 /* 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
|
3397 FLAG = -1 means check for starting with defun |
341 | 3398 and make structure pure. */ |
3399 | |
3400 static Lisp_Object | |
3401 read_list (flag, readcharfun) | |
3402 int flag; | |
3403 register Lisp_Object readcharfun; | |
3404 { | |
3405 /* -1 means check next element for defun, | |
3406 0 means don't check, | |
3407 1 means already checked and found defun. */ | |
3408 int defunflag = flag < 0 ? -1 : 0; | |
3409 Lisp_Object val, tail; | |
3410 register Lisp_Object elt, tem; | |
3411 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
|
3412 /* 0 is the normal case. |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3413 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
|
3414 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
|
3415 int doc_reference = 0; |
341 | 3416 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3417 /* 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
|
3418 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
|
3419 |
341 | 3420 val = Qnil; |
3421 tail = Qnil; | |
3422 | |
3423 while (1) | |
3424 { | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3425 int ch; |
341 | 3426 GCPRO2 (val, tail); |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3427 elt = read1 (readcharfun, &ch, first_in_list); |
341 | 3428 UNGCPRO; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3429 |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3430 first_in_list = 0; |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3431 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3432 /* 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
|
3433 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
|
3434 && ! 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
|
3435 && !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
|
3436 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3437 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
|
3438 /* 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
|
3439 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
|
3440 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
|
3441 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
|
3442 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
|
3443 else |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3444 /* 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
|
3445 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
|
3446 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
|
3447 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
|
3448 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
|
3449 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
|
3450 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
|
3451 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3452 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
|
3453 && ! NILP (elt) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3454 && load_force_doc_strings) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3455 doc_reference = 2; |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
3456 |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3457 if (ch) |
341 | 3458 { |
3459 if (flag > 0) | |
3460 { | |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3461 if (ch == ']') |
341 | 3462 return val; |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3463 invalid_syntax (") or . in a vector", 18); |
341 | 3464 } |
9358
361c6409e7c1
(read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents:
9313
diff
changeset
|
3465 if (ch == ')') |
341 | 3466 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
|
3467 if (ch == '.') |
341 | 3468 { |
3469 GCPRO2 (val, tail); | |
485 | 3470 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3471 XSETCDR (tail, read0 (readcharfun)); |
341 | 3472 else |
3473 val = read0 (readcharfun); | |
11683
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
3474 read1 (readcharfun, &ch, 0); |
341 | 3475 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
|
3476 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
|
3477 { |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3478 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
|
3479 return make_number (0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3480 if (doc_reference == 2) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3481 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3482 /* Get a doc string from the file we are loading. |
88886 | 3483 If it's in saved_doc_string, get it from there. |
3484 | |
3485 Here, we don't know if the string is a | |
3486 bytecode string or a doc string. As a | |
3487 bytecode string must be unibyte, we always | |
3488 return a unibyte string. If it is actually a | |
3489 doc string, caller must make it | |
3490 multibyte. */ | |
89483 | 3491 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
3492 int pos = XINT (XCDR (val)); |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3493 /* Position is negative for user variables. */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3494 if (pos < 0) pos = -pos; |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3495 if (pos >= saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3496 && pos < (saved_doc_string_position |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3497 + saved_doc_string_length)) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3498 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3499 int start = pos - saved_doc_string_position; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3500 int from, to; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3501 |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3502 /* Process quoting with ^A, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3503 and find the end of the string, |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3504 which is marked with ^_ (037). */ |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3505 for (from = start, to = start; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3506 saved_doc_string[from] != 037;) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3507 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3508 int c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3509 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3510 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3511 c = saved_doc_string[from++]; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3512 if (c == 1) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3513 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3514 else if (c == '0') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3515 saved_doc_string[to++] = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3516 else if (c == '_') |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3517 saved_doc_string[to++] = 037; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3518 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3519 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3520 saved_doc_string[to++] = c; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3521 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3522 |
88886 | 3523 return make_unibyte_string (saved_doc_string + start, |
3524 to - start); | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3525 } |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3526 /* 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
|
3527 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
|
3528 && pos < (prev_saved_doc_string_position |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3529 + prev_saved_doc_string_length)) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3530 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3531 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
|
3532 int from, to; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3533 |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3534 /* Process quoting with ^A, |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3535 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
|
3536 which is marked with ^_ (037). */ |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3537 for (from = start, to = start; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3538 prev_saved_doc_string[from] != 037;) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3539 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3540 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
|
3541 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3542 { |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3543 c = prev_saved_doc_string[from++]; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3544 if (c == 1) |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3545 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3546 else if (c == '0') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3547 prev_saved_doc_string[to++] = 0; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3548 else if (c == '_') |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3549 prev_saved_doc_string[to++] = 037; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3550 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3551 else |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3552 prev_saved_doc_string[to++] = c; |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3553 } |
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3554 |
88886 | 3555 return make_unibyte_string (prev_saved_doc_string |
3556 + start, | |
3557 to - start); | |
22321
2b81c3b8f0c8
Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents:
22103
diff
changeset
|
3558 } |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3559 else |
88886 | 3560 return get_doc_string (val, 1, 0); |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3561 } |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3562 |
12639
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3563 return val; |
1410ce7c4fab
(read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents:
12545
diff
changeset
|
3564 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3565 invalid_syntax (". in wrong context", 18); |
341 | 3566 } |
71984
bb119ed4db49
(Fload): Use xsignal2, signal_error.
Kim F. Storm <storm@cua.dk>
parents:
71837
diff
changeset
|
3567 invalid_syntax ("] in a list", 11); |
341 | 3568 } |
3569 tem = (read_pure && flag <= 0 | |
3570 ? pure_cons (elt, Qnil) | |
3571 : Fcons (elt, Qnil)); | |
485 | 3572 if (!NILP (tail)) |
40690
ba7239b8872e
(Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents:
40656
diff
changeset
|
3573 XSETCDR (tail, tem); |
341 | 3574 else |
3575 val = tem; | |
3576 tail = tem; | |
3577 if (defunflag < 0) | |
3578 defunflag = EQ (elt, Qdefun); | |
3579 else if (defunflag > 0) | |
3580 read_pure = 1; | |
3581 } | |
3582 } | |
3583 | |
3584 Lisp_Object Vobarray; | |
3585 Lisp_Object initial_obarray; | |
3586 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3587 /* 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
|
3588 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3589 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
|
3590 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3591 static int hash_string (); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3592 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3593 /* 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
|
3594 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
|
3595 |
341 | 3596 Lisp_Object |
3597 check_obarray (obarray) | |
3598 Lisp_Object obarray; | |
3599 { | |
71837
b4bcd3aefbe8
(check_obarray): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71673
diff
changeset
|
3600 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3601 { |
3602 /* If Vobarray is now invalid, force it to be valid. */ | |
3603 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
|
3604 wrong_type_argument (Qvectorp, obarray); |
341 | 3605 } |
3606 return obarray; | |
3607 } | |
3608 | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3609 /* 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
|
3610 interned in the current obarray. */ |
341 | 3611 |
3612 Lisp_Object | |
3613 intern (str) | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3614 const char *str; |
341 | 3615 { |
3616 Lisp_Object tem; | |
3617 int len = strlen (str); | |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3618 Lisp_Object obarray; |
341 | 3619 |
6503
7c566d0e4b3d
(read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6471
diff
changeset
|
3620 obarray = Vobarray; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3621 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
341 | 3622 obarray = check_obarray (obarray); |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3623 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
|
3624 if (SYMBOLP (tem)) |
341 | 3625 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
|
3626 return Fintern (make_string (str, len), obarray); |
341 | 3627 } |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3628 |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3629 Lisp_Object |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3630 intern_c_string (const char *str) |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3631 { |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3632 Lisp_Object tem; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3633 int len = strlen (str); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3634 Lisp_Object obarray; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3635 |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3636 obarray = Vobarray; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3637 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
|
3638 obarray = check_obarray (obarray); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3639 tem = oblookup (obarray, str, len, len); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3640 if (SYMBOLP (tem)) |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3641 return tem; |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3642 |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3643 if (NILP (Vpurify_flag)) |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3644 /* 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
|
3645 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
|
3646 with the extra copy. */ |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3647 abort (); |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3648 |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3649 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
|
3650 } |
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3651 |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3652 /* 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
|
3653 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3654 Lisp_Object |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3655 make_symbol (str) |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3656 char *str; |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3657 { |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3658 int len = strlen (str); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3659 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3660 return Fmake_symbol ((!NILP (Vpurify_flag) |
21251
05fbf4f5b14f
(read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
3661 ? make_pure_string (str, len, len, 0) |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3662 : make_string (str, len))); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
3663 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3664 |
341 | 3665 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
|
3666 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
|
3667 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
|
3668 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
|
3669 it defaults to the value of `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3670 (string, obarray) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3671 Lisp_Object string, obarray; |
341 | 3672 { |
3673 register Lisp_Object tem, sym, *ptr; | |
3674 | |
485 | 3675 if (NILP (obarray)) obarray = Vobarray; |
341 | 3676 obarray = check_obarray (obarray); |
3677 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3678 CHECK_STRING (string); |
341 | 3679 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3680 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
|
3681 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3682 SBYTES (string)); |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3683 if (!INTEGERP (tem)) |
341 | 3684 return tem; |
3685 | |
485 | 3686 if (!NILP (Vpurify_flag)) |
14092
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3687 string = Fpurecopy (string); |
279f5f3528a8
(Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
3688 sym = Fmake_symbol (string); |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3689 |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3690 if (EQ (obarray, initial_obarray)) |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3691 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
|
3692 else |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3693 XSYMBOL (sym)->interned = SYMBOL_INTERNED; |
341 | 3694 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3695 if ((SREF (string, 0) == ':') |
21982
456f95c03285
(Fintern): Properly compare lisp objects.
Richard M. Stallman <rms@gnu.org>
parents:
21936
diff
changeset
|
3696 && EQ (obarray, initial_obarray)) |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3697 { |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3698 XSYMBOL (sym)->constant = 1; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3699 XSYMBOL (sym)->value = sym; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3700 } |
17918
72aec83491a2
(Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents:
17605
diff
changeset
|
3701 |
341 | 3702 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
|
3703 if (SYMBOLP (*ptr)) |
341 | 3704 XSYMBOL (sym)->next = XSYMBOL (*ptr); |
3705 else | |
3706 XSYMBOL (sym)->next = 0; | |
3707 *ptr = sym; | |
3708 return sym; | |
3709 } | |
3710 | |
3711 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
|
3712 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
|
3713 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
|
3714 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
|
3715 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
|
3716 it defaults to the value of `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3717 (name, obarray) |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3718 Lisp_Object name, obarray; |
341 | 3719 { |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3720 register Lisp_Object tem, string; |
341 | 3721 |
485 | 3722 if (NILP (obarray)) obarray = Vobarray; |
341 | 3723 obarray = check_obarray (obarray); |
3724 | |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3725 if (!SYMBOLP (name)) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3726 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3727 CHECK_STRING (name); |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3728 string = name; |
26735
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3729 } |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3730 else |
46446
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3731 string = SYMBOL_NAME (name); |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3732 |
34f82dbd015b
(Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents:
46429
diff
changeset
|
3733 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
|
3734 if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem))) |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3735 return Qnil; |
c13ab7bc6fdc
(Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
3736 else |
341 | 3737 return tem; |
3738 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3739 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3740 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
|
3741 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
|
3742 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
|
3743 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
|
3744 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
|
3745 OBARRAY defaults to the value of the variable `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3746 (name, obarray) |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3747 Lisp_Object name, obarray; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3748 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3749 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
|
3750 int hash; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3751 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3752 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
|
3753 obarray = check_obarray (obarray); |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3754 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3755 if (SYMBOLP (name)) |
45406
6f19e244af49
* lread.c (Fintern_soft, oblookup): Use SYMBOL_NAME and XSTRING
Ken Raeburn <raeburn@raeburn.org>
parents:
45001
diff
changeset
|
3756 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
|
3757 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3758 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40558
diff
changeset
|
3759 CHECK_STRING (name); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3760 string = name; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3761 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3762 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3763 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
|
3764 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3765 SBYTES (string)); |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3766 if (INTEGERP (tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3767 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3768 /* 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
|
3769 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
|
3770 return Qnil; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3771 |
106133
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3772 /* 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
|
3773 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
|
3774 `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
|
3775 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
|
3776 /* if (EQ (tem, Qnil) || EQ (tem, Qt)) |
5e6998ac1a2e
(Funintern): Comment out last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106117
diff
changeset
|
3777 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
|
3778 |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3779 XSYMBOL (tem)->interned = SYMBOL_UNINTERNED; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3780 XSYMBOL (tem)->constant = 0; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3781 XSYMBOL (tem)->indirect_variable = 0; |
20773
6c655dc99321
(Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
3782 |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3783 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
|
3784 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3785 if (EQ (XVECTOR (obarray)->contents[hash], tem)) |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3786 { |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3787 if (XSYMBOL (tem)->next) |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3788 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3789 else |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3790 XSETINT (XVECTOR (obarray)->contents[hash], 0); |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
3791 } |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3792 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3793 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3794 Lisp_Object tail, following; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3795 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3796 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
|
3797 XSYMBOL (tail)->next; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3798 tail = following) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3799 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3800 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
|
3801 if (EQ (following, tem)) |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3802 { |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3803 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
|
3804 break; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3805 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3806 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3807 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3808 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3809 return Qt; |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3810 } |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3811 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3812 /* 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
|
3813 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
|
3814 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
|
3815 |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3816 Also store the bucket number in oblookup_last_bucket_number. */ |
341 | 3817 |
3818 Lisp_Object | |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3819 oblookup (obarray, ptr, size, size_byte) |
341 | 3820 Lisp_Object obarray; |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3821 register const char *ptr; |
20609
4bf29951648f
(read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents:
20566
diff
changeset
|
3822 int size, size_byte; |
341 | 3823 { |
8828 | 3824 int hash; |
3825 int obsize; | |
341 | 3826 register Lisp_Object tail; |
3827 Lisp_Object bucket, tem; | |
3828 | |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3829 if (!VECTORP (obarray) |
5243 | 3830 || (obsize = XVECTOR (obarray)->size) == 0) |
341 | 3831 { |
3832 obarray = check_obarray (obarray); | |
3833 obsize = XVECTOR (obarray)->size; | |
3834 } | |
13455
4f5a9ce67782
(oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
3835 /* 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
|
3836 obsize &= ~ARRAY_MARK_FLAG; |
97142 | 3837 hash = hash_string (ptr, size_byte) % obsize; |
341 | 3838 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
|
3839 oblookup_last_bucket_number = hash; |
58449
377948a6af9a
(oblookup): Don't use XFASTINT blindly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58093
diff
changeset
|
3840 if (EQ (bucket, make_number (0))) |
341 | 3841 ; |
9149
fe6b30db719d
(readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents:
8906
diff
changeset
|
3842 else if (!SYMBOLP (bucket)) |
341 | 3843 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
|
3844 else |
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3845 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next)) |
341 | 3846 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3847 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
|
3848 && SCHARS (SYMBOL_NAME (tail)) == size |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3849 && !bcmp (SDATA (SYMBOL_NAME (tail)), ptr, size_byte)) |
341 | 3850 return tail; |
3851 else if (XSYMBOL (tail)->next == 0) | |
3852 break; | |
3853 } | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3854 XSETINT (tem, hash); |
341 | 3855 return tem; |
3856 } | |
3857 | |
3858 static int | |
3859 hash_string (ptr, len) | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3860 const unsigned char *ptr; |
341 | 3861 int len; |
3862 { | |
46472
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3863 register const unsigned char *p = ptr; |
c246e05b9c70
(intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents:
46446
diff
changeset
|
3864 register const unsigned char *end = p + len; |
341 | 3865 register unsigned char c; |
3866 register int hash = 0; | |
3867 | |
3868 while (p != end) | |
3869 { | |
3870 c = *p++; | |
3871 if (c >= 0140) c -= 40; | |
3872 hash = ((hash<<3) + (hash>>28) + c); | |
3873 } | |
3874 return hash & 07777777777; | |
3875 } | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
3876 |
341 | 3877 void |
3878 map_obarray (obarray, fn, arg) | |
3879 Lisp_Object obarray; | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3880 void (*fn) P_ ((Lisp_Object, Lisp_Object)); |
341 | 3881 Lisp_Object arg; |
3882 { | |
3883 register int i; | |
3884 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
|
3885 CHECK_VECTOR (obarray); |
341 | 3886 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--) |
3887 { | |
3888 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
|
3889 if (SYMBOLP (tail)) |
341 | 3890 while (1) |
3891 { | |
3892 (*fn) (tail, arg); | |
3893 if (XSYMBOL (tail)->next == 0) | |
3894 break; | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3895 XSETSYMBOL (tail, XSYMBOL (tail)->next); |
341 | 3896 } |
3897 } | |
3898 } | |
3899 | |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
3900 void |
341 | 3901 mapatoms_1 (sym, function) |
3902 Lisp_Object sym, function; | |
3903 { | |
3904 call1 (function, sym); | |
3905 } | |
3906 | |
3907 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
|
3908 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
|
3909 OBARRAY defaults to the value of `obarray'. */) |
816ced6caae8
(Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents:
40784
diff
changeset
|
3910 (function, obarray) |
341 | 3911 Lisp_Object function, obarray; |
3912 { | |
485 | 3913 if (NILP (obarray)) obarray = Vobarray; |
341 | 3914 obarray = check_obarray (obarray); |
3915 | |
3916 map_obarray (obarray, mapatoms_1, function); | |
3917 return Qnil; | |
3918 } | |
3919 | |
5117
951396781a0e
(OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents:
5017
diff
changeset
|
3920 #define OBARRAY_SIZE 1511 |
341 | 3921 |
3922 void | |
3923 init_obarray () | |
3924 { | |
3925 Lisp_Object oblength; | |
3926 int hash; | |
3927 Lisp_Object *tem; | |
3928 | |
9313
ed68c3822e4b
(read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9274
diff
changeset
|
3929 XSETFASTINT (oblength, OBARRAY_SIZE); |
341 | 3930 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3931 Qnil = Fmake_symbol (make_pure_c_string ("nil")); |
341 | 3932 Vobarray = Fmake_vector (oblength, make_number (0)); |
3933 initial_obarray = Vobarray; | |
3934 staticpro (&initial_obarray); | |
3935 /* Intern nil in the obarray */ | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3936 XSYMBOL (Qnil)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY; |
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3937 XSYMBOL (Qnil)->constant = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
3938 |
341 | 3939 /* These locals are to kludge around a pyramid compiler bug. */ |
3940 hash = hash_string ("nil", 3); | |
3941 /* Separate statement here to avoid VAXC bug. */ | |
3942 hash %= OBARRAY_SIZE; | |
3943 tem = &XVECTOR (Vobarray)->contents[hash]; | |
3944 *tem = Qnil; | |
3945 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3946 Qunbound = Fmake_symbol (make_pure_c_string ("unbound")); |
341 | 3947 XSYMBOL (Qnil)->function = Qunbound; |
3948 XSYMBOL (Qunbound)->value = Qunbound; | |
3949 XSYMBOL (Qunbound)->function = Qunbound; | |
3950 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3951 Qt = intern_c_string ("t"); |
341 | 3952 XSYMBOL (Qnil)->value = Qnil; |
3953 XSYMBOL (Qnil)->plist = Qnil; | |
3954 XSYMBOL (Qt)->value = Qt; | |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
3955 XSYMBOL (Qt)->constant = 1; |
341 | 3956 |
3957 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */ | |
3958 Vpurify_flag = Qt; | |
3959 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3960 Qvariable_documentation = intern_c_string ("variable-documentation"); |
16228
fa7a56c543df
(init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents:
16165
diff
changeset
|
3961 staticpro (&Qvariable_documentation); |
341 | 3962 |
26866
305531847450
(readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents:
26755
diff
changeset
|
3963 read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH; |
27852
98f55bbdbbad
(Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents:
27763
diff
changeset
|
3964 read_buffer = (char *) xmalloc (read_buffer_size); |
341 | 3965 } |
3966 | |
3967 void | |
3968 defsubr (sname) | |
3969 struct Lisp_Subr *sname; | |
3970 { | |
3971 Lisp_Object sym; | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
3972 sym = intern_c_string (sname->symbol_name); |
85015
695c195058e7
(defsubr): Use XSETPVECTYPE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85011
diff
changeset
|
3973 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
|
3974 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3975 } |
3976 | |
3977 #ifdef NOTDEF /* use fset in subr.el now */ | |
3978 void | |
3979 defalias (sname, string) | |
3980 struct Lisp_Subr *sname; | |
3981 char *string; | |
3982 { | |
3983 Lisp_Object sym; | |
3984 sym = intern (string); | |
9274
5c66d8b65a7c
(Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents:
9149
diff
changeset
|
3985 XSETSUBR (XSYMBOL (sym)->function, sname); |
341 | 3986 } |
3987 #endif /* NOTDEF */ | |
3988 | |
3989 /* 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
|
3990 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
|
3991 DEFVAR_INT ("emacs-priority", &emacs_priority, "Documentation"); */ |
341 | 3992 void |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3993 defvar_int (const char *namestring, EMACS_INT *address) |
341 | 3994 { |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3995 Lisp_Object sym, val; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
3996 sym = intern_c_string (namestring); |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
3997 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3998 XMISCTYPE (val) = Lisp_Misc_Intfwd; |
9913
c921977bb0ce
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents:
9871
diff
changeset
|
3999 XINTFWD (val)->intvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
4000 SET_SYMBOL_VALUE (sym, val); |
341 | 4001 } |
4002 | |
42206 | 4003 /* 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
|
4004 nil if address contains 0. */ |
341 | 4005 void |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
4006 defvar_bool (const char *namestring, int *address) |
341 | 4007 { |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
4008 Lisp_Object sym, val; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
4009 sym = intern_c_string (namestring); |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
4010 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4011 XMISCTYPE (val) = Lisp_Misc_Boolfwd; |
9913
c921977bb0ce
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents:
9871
diff
changeset
|
4012 XBOOLFWD (val)->boolvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
4013 SET_SYMBOL_VALUE (sym, val); |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4014 Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars); |
341 | 4015 } |
4016 | |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
4017 /* 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
|
4018 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
|
4019 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
|
4020 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
|
4021 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
|
4022 void |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
4023 defvar_lisp_nopro (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
|
4024 { |
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
4025 Lisp_Object sym, val; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
4026 sym = intern_c_string (namestring); |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
4027 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4028 XMISCTYPE (val) = Lisp_Misc_Objfwd; |
9913
c921977bb0ce
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents:
9871
diff
changeset
|
4029 XOBJFWD (val)->objvar = address; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
4030 SET_SYMBOL_VALUE (sym, val); |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
4031 } |
341 | 4032 |
4033 void | |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
4034 defvar_lisp (const char *namestring, Lisp_Object *address) |
341 | 4035 { |
9466
9052bf69f7de
(defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents:
9363
diff
changeset
|
4036 defvar_lisp_nopro (namestring, address); |
341 | 4037 staticpro (address); |
4038 } | |
4039 | |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
4040 /* 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
|
4041 at a particular offset in the current kboard object. */ |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
4042 |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
4043 void |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
4044 defvar_kboard (const char *namestring, int offset) |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
4045 { |
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
4046 Lisp_Object sym, val; |
105872
89183b6f6e9d
* process.c (socket_options): Make it const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105798
diff
changeset
|
4047 sym = intern_c_string (namestring); |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
4048 val = allocate_misc (); |
11242
36e8e27c8625
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4049 XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd; |
11020
0951bb12c8ee
(defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents:
10650
diff
changeset
|
4050 XKBOARD_OBJFWD (val)->offset = offset; |
39580
ee9c4218a600
(Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents:
37981
diff
changeset
|
4051 SET_SYMBOL_VALUE (sym, val); |
10606
97b210b19217
(defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10200
diff
changeset
|
4052 } |
341 | 4053 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4054 /* 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
|
4055 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
|
4056 static Lisp_Object dump_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4057 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
4058 void |
364 | 4059 init_lread () |
341 | 4060 { |
617 | 4061 char *normal; |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4062 int turn_off_warning = 0; |
341 | 4063 |
364 | 4064 /* Compute the default load-path. */ |
617 | 4065 #ifdef CANNOT_DUMP |
4066 normal = PATH_LOADSEARCH; | |
638 | 4067 Vload_path = decode_env_path (0, normal); |
617 | 4068 #else |
4069 if (NILP (Vpurify_flag)) | |
4070 normal = PATH_LOADSEARCH; | |
4071 else | |
4072 normal = PATH_DUMPLOADSEARCH; | |
4073 | |
4074 /* In a dumped Emacs, we normally have to reset the value of | |
4075 Vload_path from PATH_LOADSEARCH, since the value that was dumped | |
4076 uses ../lisp, instead of the path of the installed elisp | |
4077 libraries. However, if it appears that Vload_path was changed | |
4078 from the default before dumping, don't override that value. */ | |
621 | 4079 if (initialized) |
4080 { | |
4081 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
|
4082 { |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
4083 Vload_path = decode_env_path (0, normal); |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4084 if (!NILP (Vinstallation_directory)) |
4482
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
4085 { |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4086 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
|
4087 |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4088 /* 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
|
4089 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
|
4090 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
|
4091 sitelisp = Qnil; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4092 while (1) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4093 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4094 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
|
4095 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
|
4096 tem, Qnil); |
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 (tem1)) |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4098 { |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4099 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
|
4100 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
|
4101 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4102 else |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4103 break; |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4104 } |
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4105 |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4106 /* 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
|
4107 installation dir, if it exists. */ |
5617
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4108 tem = Fexpand_file_name (build_string ("lisp"), |
0b312b3fa24e
(init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents:
5568
diff
changeset
|
4109 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
|
4110 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
|
4111 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
|
4112 { |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4113 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
|
4114 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4115 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
|
4116 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
|
4117 } |
7004
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4118 } |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4119 else |
0c4d3481bb1b
(init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents:
6503
diff
changeset
|
4120 /* 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
|
4121 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
|
4122 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
|
4123 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4124 /* 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
|
4125 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
|
4126 Vinstallation_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4127 tem1 = Ffile_exists_p (tem); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4128 if (!NILP (tem1)) |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4129 { |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4130 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
|
4131 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
|
4132 } |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4133 |
78928
c66755cf0647
(Fload): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78629
diff
changeset
|
4134 /* 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
|
4135 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
|
4136 Vinstallation_directory); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4137 tem1 = Ffile_exists_p (tem); |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4138 if (!NILP (tem1)) |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4139 { |
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4140 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
|
4141 Vload_path = Fcons (tem, Vload_path); |
11311
864c3dea8754
(read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents:
11242
diff
changeset
|
4142 } |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4143 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4144 /* 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
|
4145 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
|
4146 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
|
4147 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4148 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
|
4149 { |
18771
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4150 Lisp_Object tem2; |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4151 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4152 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
|
4153 Vinstallation_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4154 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
|
4155 |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4156 /* 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
|
4157 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
|
4158 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
|
4159 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
|
4160 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
|
4161 Vinstallation_directory); |
c0b6ecdf4a2b
(init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents:
18665
diff
changeset
|
4162 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
|
4163 if (!NILP (tem1) && NILP (tem2)) |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4164 { |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4165 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
|
4166 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4167 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4168 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
|
4169 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
|
4170 |
18530
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4171 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
|
4172 Vsource_directory); |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4173 |
94c18a43de33
(init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents:
18084
diff
changeset
|
4174 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
|
4175 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
|
4176 |
18084
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4177 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
|
4178 Vsource_directory); |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4179 |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4180 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
|
4181 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
|
4182 } |
6f264bb70b49
(init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents:
18051
diff
changeset
|
4183 } |
42797
2fc2abcdc67c
(init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents:
42424
diff
changeset
|
4184 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
|
4185 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
|
4186 } |
09d0f4b26641
(init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents:
3704
diff
changeset
|
4187 } |
621 | 4188 } |
4189 else | |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4190 { |
17605
83850481ae70
(init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents:
17325
diff
changeset
|
4191 /* 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
|
4192 /* 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
|
4193 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
|
4194 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
|
4195 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
|
4196 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
|
4197 dump_path = Vload_path; |
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4198 } |
364 | 4199 #endif |
4200 | |
104853 | 4201 #if (!(defined (WINDOWSNT) || (defined (HAVE_NS)))) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4202 /* 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
|
4203 almost never correct, thereby causing a warning to be printed out that |
14036 | 4204 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
|
4205 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
|
4206 |
341 | 4207 /* 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
|
4208 if (!turn_off_warning) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4209 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4210 Lisp_Object path_tail; |
341 | 4211 |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4212 for (path_tail = Vload_path; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4213 !NILP (path_tail); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25555
diff
changeset
|
4214 path_tail = XCDR (path_tail)) |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4215 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4216 Lisp_Object dirfile; |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4217 dirfile = Fcar (path_tail); |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4218 if (STRINGP (dirfile)) |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4219 { |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4220 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
|
4221 if (access (SDATA (dirfile), 0) < 0) |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4222 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
|
4223 XCAR (path_tail)); |
11735
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4224 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4225 } |
f2f0f3b55a7e
(isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents:
11699
diff
changeset
|
4226 } |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
4227 #endif /* !(WINDOWSNT || HAVE_NS) */ |
617 | 4228 |
4229 /* If the EMACSLOADPATH environment variable is set, use its value. | |
4230 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
|
4231 #ifndef CANNOT_DUMP |
617 | 4232 if (NILP (Vpurify_flag) |
4233 && egetenv ("EMACSLOADPATH")) | |
11955
d972c95e7577
(init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11868
diff
changeset
|
4234 #endif |
364 | 4235 Vload_path = decode_env_path ("EMACSLOADPATH", normal); |
4236 | |
4237 Vvalues = Qnil; | |
4238 | |
341 | 4239 load_in_progress = 0; |
15283
b2be450a8da4
(init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
15091
diff
changeset
|
4240 Vload_file_name = Qnil; |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4241 |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4242 load_descriptor_list = Qnil; |
21291
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4243 |
b039d32d8399
(init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents:
21251
diff
changeset
|
4244 Vstandard_input = Qt; |
31536
76cf765a7dad
(init_lread): Set Vloads_in_progress to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
31534
diff
changeset
|
4245 Vloads_in_progress = Qnil; |
341 | 4246 } |
4247 | |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4248 /* 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
|
4249 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
|
4250 |
20298
b7d23d2eded1
(read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents:
20168
diff
changeset
|
4251 void |
16487
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4252 dir_warning (format, dirname) |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4253 char *format; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4254 Lisp_Object dirname; |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4255 { |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4256 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
|
4257 = (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
|
4258 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4259 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
|
4260 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
|
4261 /* 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
|
4262 if (initialized) |
f654c3b16214
(dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents:
21724
diff
changeset
|
4263 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
|
4264 } |
8e154ff6d4bf
(dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16383
diff
changeset
|
4265 |
341 | 4266 void |
364 | 4267 syms_of_lread () |
341 | 4268 { |
4269 defsubr (&Sread); | |
4270 defsubr (&Sread_from_string); | |
4271 defsubr (&Sintern); | |
4272 defsubr (&Sintern_soft); | |
11188
d7f70df00bb0
(oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents:
11172
diff
changeset
|
4273 defsubr (&Sunintern); |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4274 defsubr (&Sget_load_suffixes); |
341 | 4275 defsubr (&Sload); |
672 | 4276 defsubr (&Seval_buffer); |
341 | 4277 defsubr (&Seval_region); |
4278 defsubr (&Sread_char); | |
4279 defsubr (&Sread_char_exclusive); | |
4280 defsubr (&Sread_event); | |
4281 defsubr (&Sget_file_char); | |
4282 defsubr (&Smapatoms); | |
45001
a3bd03ed0409
(openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44222
diff
changeset
|
4283 defsubr (&Slocate_file_internal); |
341 | 4284 |
4285 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
|
4286 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
|
4287 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
|
4288 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
|
4289 to find all the symbols in an obarray, use `mapatoms'. */); |
341 | 4290 |
4291 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
|
4292 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
|
4293 Order is reverse chronological. */); |
341 | 4294 |
4295 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
|
4296 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
|
4297 See documentation of `read' for possible values. */); |
341 | 4298 Vstandard_input = Qt; |
4299 | |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4300 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
|
4301 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
|
4302 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4303 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
|
4304 will be added to `read-symbol-positions-list'. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4305 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
|
4306 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
|
4307 defined, although they may be in the future. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4308 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4309 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
|
4310 `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
|
4311 the toplevel; bind it instead. */); |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4312 Vread_with_symbol_positions = Qnil; |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4313 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4314 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
|
4315 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
|
4316 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
|
4317 `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
|
4318 non-nil. |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4319 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4320 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
|
4321 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
|
4322 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
|
4323 |
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4324 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
|
4325 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
|
4326 were read in. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4327 Vread_symbol_positions_list = Qnil; |
45554
cf7f041fd98e
lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents:
45406
diff
changeset
|
4328 |
103101
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
4329 DEFVAR_LISP ("read-circle", &Vread_circle, |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
4330 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
|
4331 Vread_circle = Qt; |
58c92ec0c915
* files.el (hack-local-variables-prop-line)
Chong Yidong <cyd@stupidchicken.com>
parents:
102465
diff
changeset
|
4332 |
341 | 4333 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
|
4334 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
|
4335 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
|
4336 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
|
4337 otherwise to default specified by file `epaths.h' when Emacs was built. */); |
341 | 4338 |
39808
98efaf9813f4
(Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39580
diff
changeset
|
4339 DEFVAR_LISP ("load-suffixes", &Vload_suffixes, |
69170
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4340 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
|
4341 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
|
4342 `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
|
4343 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
|
4344 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
|
4345 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
|
4346 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
|
4347 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
|
4348 the same file. |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4349 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
|
4350 |
7de818fd5125
Declare Vload_file_rep_suffixes instead of
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
4351 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
|
4352 `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
|
4353 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
|
4354 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
|
4355 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
|
4356 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
|
4357 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
|
4358 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
|
4359 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
|
4360 |
341 | 4361 DEFVAR_BOOL ("load-in-progress", &load_in_progress, |
78501 | 4362 doc: /* Non-nil if inside of `load'. */); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4363 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
|
4364 staticpro (&Qload_in_progress); |
341 | 4365 |
4366 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
|
4367 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
|
4368 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
|
4369 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4370 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
|
4371 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
|
4372 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4373 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
|
4374 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
|
4375 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
|
4376 |
b34d05d3a567
lread.c (Vload_history): Enhance doc-string to say that the file is the
Alan Mackenzie <acm@muc.de>
parents:
70595
diff
changeset
|
4377 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
|
4378 the rest of the FORMS. */); |
341 | 4379 Vafter_load_alist = Qnil; |
4380 | |
2545
d666732c5f41
(readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents:
2439
diff
changeset
|
4381 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
|
4382 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
|
4383 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
|
4384 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
|
4385 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
|
4386 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
|
4387 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
|
4388 |
de63af995d1c
* src/lread.c (syms_of_lread): Make it clearer that these are the
Chong Yidong <cyd@stupidchicken.com>
parents:
106406
diff
changeset
|
4389 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
|
4390 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
|
4391 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
|
4392 `(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
|
4393 `(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
|
4394 . 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
|
4395 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
|
4396 |
66333
087e7eef40d2
(build_load_history): Replace STREAM arg with ENTIRE.
Richard M. Stallman <rms@gnu.org>
parents:
66284
diff
changeset
|
4397 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
|
4398 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
|
4399 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
|
4400 |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4401 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
|
4402 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
|
4403 Vload_file_name = Qnil; |
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4404 |
24817
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4405 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
|
4406 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
|
4407 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
|
4408 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
|
4409 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
|
4410 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
|
4411 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
|
4412 Vuser_init_file = Qnil; |
3e8c8a06329b
(Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
24412
diff
changeset
|
4413 |
2901
510a7ebce564
(syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
2781
diff
changeset
|
4414 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
|
4415 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
|
4416 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
|
4417 |
11079
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4418 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
|
4419 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
|
4420 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
|
4421 Vload_read_function = Qnil; |
aeaaa579d967
(Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
11020
diff
changeset
|
4422 |
17038 | 4423 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
|
4424 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
|
4425 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
|
4426 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
|
4427 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
|
4428 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
|
4429 See `load' for the meaning of the remaining arguments. */); |
17038 | 4430 Vload_source_file_function = Qnil; |
4431 | |
12780
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4432 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
|
4433 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
|
4434 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
|
4435 load_force_doc_strings = 0; |
2c1f71512d5d
(saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12639
diff
changeset
|
4436 |
21677
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4437 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
|
4438 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
|
4439 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
|
4440 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
|
4441 load_convert_to_unibyte = 0; |
f42b78e033db
(readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
21636
diff
changeset
|
4442 |
13601
0a091134e047
(Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13455
diff
changeset
|
4443 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
|
4444 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
|
4445 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
|
4446 Vsource_directory |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4447 = Fexpand_file_name (build_string ("../"), |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4448 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH))); |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4449 |
18665
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4450 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
|
4451 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
|
4452 Vpreloaded_file_list = Qnil; |
6d7b8b35d878
(Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18530
diff
changeset
|
4453 |
25555
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4454 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
|
4455 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
|
4456 Vbyte_boolean_vars = Qnil; |
301ce7f0b398
(Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents:
25251
diff
changeset
|
4457 |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4458 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
|
4459 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
|
4460 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
|
4461 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
|
4462 them. */); |
28156
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4463 load_dangerous_libraries = 0; |
2e784b17f85a
(load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
27852
diff
changeset
|
4464 |
104064
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
4465 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
|
4466 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
|
4467 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
|
4468 force_load_messages = 0; |
c7d7a59beb35
(syms_of_lread) <force_load_messages>: New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
104059
diff
changeset
|
4469 |
31367
22eb2b661cdf
(syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents:
31315
diff
changeset
|
4470 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
|
4471 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
|
4472 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
|
4473 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
|
4474 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
|
4475 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
|
4476 Vbytecomp_version_regexp |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4477 = 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
|
4478 |
64205
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4479 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
|
4480 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
|
4481 Veval_buffer_list = Qnil; |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4482 |
78614
036719d86e2c
(syms_of_lread): Export old-style-backquotes to Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78612
diff
changeset
|
4483 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
|
4484 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
|
4485 Vold_style_backquotes = Qnil; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4486 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
|
4487 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
|
4488 |
14300
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4489 /* Vsource_directory was initialized in init_lread. */ |
f777822a5d81
(syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
4490 |
5568
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4491 load_descriptor_list = Qnil; |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4492 staticpro (&load_descriptor_list); |
1af95f18f709
(Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents:
5496
diff
changeset
|
4493 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4494 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
|
4495 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
|
4496 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4497 Qstandard_input = intern_c_string ("standard-input"); |
341 | 4498 staticpro (&Qstandard_input); |
4499 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4500 Qread_char = intern_c_string ("read-char"); |
341 | 4501 staticpro (&Qread_char); |
4502 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4503 Qget_file_char = intern_c_string ("get-file-char"); |
341 | 4504 staticpro (&Qget_file_char); |
2044
258362f03d90
(syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents:
2018
diff
changeset
|
4505 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4506 Qget_emacs_mule_file_char = intern_c_string ("get-emacs-mule-file-char"); |
88886 | 4507 staticpro (&Qget_emacs_mule_file_char); |
4508 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4509 Qload_force_doc_strings = intern_c_string ("load-force-doc-strings"); |
88886 | 4510 staticpro (&Qload_force_doc_strings); |
4511 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4512 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
|
4513 staticpro (&Qbackquote); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4514 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
|
4515 staticpro (&Qcomma); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4516 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
|
4517 staticpro (&Qcomma_at); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4518 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
|
4519 staticpro (&Qcomma_dot); |
355d0b23a080
(read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
11311
diff
changeset
|
4520 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4521 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
|
4522 staticpro (&Qinhibit_file_name_operation); |
c46111ba348b
(openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents:
16925
diff
changeset
|
4523 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4524 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
|
4525 staticpro (&Qascii_character); |
3625
57174f9b1870
(Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents:
3041
diff
changeset
|
4526 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4527 Qfunction = intern_c_string ("function"); |
13235
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4528 staticpro (&Qfunction); |
0f83b9eb5478
(read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13146
diff
changeset
|
4529 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4530 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
|
4531 staticpro (&Qload); |
10200
899f5bd94bbb
(Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10163
diff
changeset
|
4532 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4533 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
|
4534 staticpro (&Qload_file_name); |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4535 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4536 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
|
4537 staticpro (&Qeval_buffer_list); |
05b076cad2f4
(Qeval_buffer_list, Veval_buffer_list): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
4538 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4539 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
|
4540 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
|
4541 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4542 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
|
4543 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
|
4544 |
14130
99ab26698ab0
(read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents:
14092
diff
changeset
|
4545 staticpro (&dump_path); |
16141
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4546 |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4547 staticpro (&read_objects); |
9cbc74969e46
Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
4548 read_objects = Qnil; |
25165
8b9110694bfa
(read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents:
24817
diff
changeset
|
4549 staticpro (&seen_list); |
64317
f69dd5d2d72d
(syms_of_lread): Initialize seen_list.
Kim F. Storm <storm@cua.dk>
parents:
64205
diff
changeset
|
4550 seen_list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48910
diff
changeset
|
4551 |
31534
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4552 Vloads_in_progress = Qnil; |
0bfeb94864e2
(Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31464
diff
changeset
|
4553 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
|
4554 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4555 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
|
4556 staticpro (&Qhash_table); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4557 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
|
4558 staticpro (&Qdata); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4559 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
|
4560 staticpro (&Qtest); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4561 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
|
4562 staticpro (&Qsize); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4563 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
|
4564 staticpro (&Qweakness); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4565 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
|
4566 staticpro (&Qrehash_size); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105872
diff
changeset
|
4567 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
|
4568 staticpro (&Qrehash_threshold); |
341 | 4569 } |
52401 | 4570 |
4571 /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d | |
4572 (do not change this comment) */ |