Mercurial > emacs
annotate src/data.c @ 111986:faa4a1c986c6
Merge changes made in Gnus trunk.
nnimap.el (nnimap-wait-for-response): Always look (at least) at the previous line.
nnimap.el (nnimap-quirk): New function.
(nnimap-retrieve-group-data-early): Use it.
(nnimap-quirks): New alist.
gnus.texi (Foreign Groups): Added clarification of foreign groups.
gnus-sum.el (gnus-summary-push-marks-to-backend): Fix the logic for copying read-ness to the backends.
gnus-group.el (gnus-group-kill-group): Notify the backend that the group has been killed.
(gnus-group-yank-group): Ditto.
gnus-start.el (gnus-subscribe-newsgroup): Notify the backend.
nnir.el: Improve customizations.
gnus.texi (Archived Messages): Removed outdated comment and text.
nnfolder.el (nnfolder-save-all-buffers): Refactor out into its own function.
(nnfolder-request-expire-articles): Save all the buffers after doing expiry.
nnmail.el (nnmail-expiry-target-group): Revert the "all articles are the last article", since that led to serious performance regressions when expiring nnml groups.
gnus-html.el (gnus-html-schedule-image-fetching): Make sure the HTML fetching stops when Gnus exits.
gnus-srvr.el: Avoid passing nil regexp argument to delete-matching-lines.
auth-source.el (auth-source-gpg-encrypt-to): New variable to set the list of recipient keys, or use symmetric encryption if not a list.
(auth-source-create): Use it to make `epa-file-encrypt-to' local for an EPA override, replacing the call to `netrc-store-data'.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 16 Dec 2010 22:22:28 +0000 |
parents | 317ffffec7f3 |
children | 417b1e4d63cd deae5bb3f0f6 |
rev | line source |
---|---|
298 | 1 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, |
106815 | 3 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
79759 | 4 Free Software Foundation, Inc. |
298 | 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:
94122
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
298 | 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:
94122
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:
94122
diff
changeset
|
11 (at your option) any later version. |
298 | 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:
94122
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
298 | 20 |
21 | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25780
diff
changeset
|
22 #include <config.h> |
298 | 23 #include <signal.h> |
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
24 #include <stdio.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103052
diff
changeset
|
25 #include <setjmp.h> |
298 | 26 #include "lisp.h" |
336 | 27 #include "puresize.h" |
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
28 #include "character.h" |
298 | 29 #include "buffer.h" |
11341 | 30 #include "keyboard.h" |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
31 #include "frame.h" |
552 | 32 #include "syssignal.h" |
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
33 #include "termhooks.h" /* For FRAME_KBOARD reference in y-or-n-p. */ |
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
34 #include "font.h" |
348 | 35 |
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2647
diff
changeset
|
36 #ifdef STDC_HEADERS |
20122
923e1f635ace
No need to include <float.h> before "lisp.h",
Paul Eggert <eggert@twinsun.com>
parents:
20055
diff
changeset
|
37 #include <float.h> |
2781
fde05936aebb
* lread.c, data.c: If STDC_HEADERS is #defined, include <stdlib.h>
Jim Blandy <jimb@redhat.com>
parents:
2647
diff
changeset
|
38 #endif |
4860
ff23fe23f58c
[hpux 7] (_MAXLDBL, _NMAXLDBL): New macro definitions.
Richard M. Stallman <rms@gnu.org>
parents:
4780
diff
changeset
|
39 |
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
40 /* If IEEE_FLOATING_POINT isn't defined, default it from FLT_*. */ |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
41 #ifndef IEEE_FLOATING_POINT |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
42 #if (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \ |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
43 && FLT_MIN_EXP == -125 && FLT_MAX_EXP == 128) |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
44 #define IEEE_FLOATING_POINT 1 |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
45 #else |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
46 #define IEEE_FLOATING_POINT 0 |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
47 #endif |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
48 #endif |
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
49 |
298 | 50 #include <math.h> |
51 | |
4780
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
52 #if !defined (atof) |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
53 extern double atof (const char *); |
4780
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
54 #endif /* !atof */ |
64cdff1c8ad1
Add declaration for atof if not predefined.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
55 |
298 | 56 Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; |
57 Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; | |
58 Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; | |
648 | 59 Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
60 Lisp_Object Qcyclic_variable_indirection, Qcircular_list; |
298 | 61 Lisp_Object Qsetting_constant, Qinvalid_read_syntax; |
62 Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; | |
4036 | 63 Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; |
298 | 64 Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; |
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
65 Lisp_Object Qtext_read_only; |
53110 | 66 |
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
67 Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; |
298 | 68 Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; |
69 Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; | |
26931 | 70 Lisp_Object Qbuffer_or_string_p, Qkeywordp; |
298 | 71 Lisp_Object Qboundp, Qfboundp; |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
72 Lisp_Object Qchar_table_p, Qvector_or_char_table_p; |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
73 |
298 | 74 Lisp_Object Qcdr; |
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
75 Lisp_Object Qad_advice_info, Qad_activate_internal; |
298 | 76 |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
77 Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error; |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
78 Lisp_Object Qoverflow_error, Qunderflow_error; |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
79 |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
80 Lisp_Object Qfloatp; |
298 | 81 Lisp_Object Qnumberp, Qnumber_or_marker_p; |
82 | |
53110 | 83 Lisp_Object Qinteger; |
84 static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; | |
109573
228a5fa4eda0
Remove extern declarations from .c files, and them to .h files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109555
diff
changeset
|
85 Lisp_Object Qwindow; |
228a5fa4eda0
Remove extern declarations from .c files, and them to .h files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109555
diff
changeset
|
86 static Lisp_Object Qfloat, Qwindow_configuration; |
17027 | 87 Lisp_Object Qprocess; |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
88 static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; |
26185 | 89 static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
90 static Lisp_Object Qsubrp, Qmany, Qunevalled; |
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
91 Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
92 |
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
93 Lisp_Object Qinteractive_form; |
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
94 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
95 static void swap_in_symval_forwarding (struct Lisp_Symbol *, struct Lisp_Buffer_Local_Value *); |
17830
3cf4a044aaad
Declare set_internal as Lisp_Object in advance to avoid
Kenichi Handa <handa@m17n.org>
parents:
17780
diff
changeset
|
96 |
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
97 Lisp_Object Vmost_positive_fixnum, Vmost_negative_fixnum; |
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
37853
diff
changeset
|
98 |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
99 |
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
100 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
101 circular_list_error (Lisp_Object list) |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
102 { |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
103 xsignal (Qcircular_list, list); |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
104 } |
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
105 |
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
106 |
298 | 107 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
108 wrong_type_argument (register Lisp_Object predicate, register Lisp_Object value) |
298 | 109 { |
105885
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
110 /* If VALUE is not even a valid Lisp object, we'd want to abort here |
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
111 where we can get a backtrace showing where it came from. We used |
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
112 to try and do that by checking the tagbits, but nowadays all |
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
113 tagbits are potentially valid. */ |
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
114 /* if ((unsigned int) XTYPE (value) >= Lisp_Type_Limit) |
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
115 * abort (); */ |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
116 |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
117 xsignal2 (Qwrong_type_argument, predicate, value); |
298 | 118 } |
119 | |
21514 | 120 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
121 pure_write_error (void) |
298 | 122 { |
123 error ("Attempt to modify read-only object"); | |
124 } | |
125 | |
126 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
127 args_out_of_range (Lisp_Object a1, Lisp_Object a2) |
298 | 128 { |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
129 xsignal2 (Qargs_out_of_range, a1, a2); |
298 | 130 } |
131 | |
132 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
133 args_out_of_range_3 (Lisp_Object a1, Lisp_Object a2, Lisp_Object a3) |
298 | 134 { |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
135 xsignal3 (Qargs_out_of_range, a1, a2, a3); |
298 | 136 } |
137 | |
138 | |
139 /* Data type predicates */ | |
140 | |
141 DEFUN ("eq", Feq, Seq, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
142 doc: /* Return t if the two args are the same Lisp object. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
143 (Lisp_Object obj1, Lisp_Object obj2) |
298 | 144 { |
145 if (EQ (obj1, obj2)) | |
146 return Qt; | |
147 return Qnil; | |
148 } | |
149 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
150 DEFUN ("null", Fnull, Snull, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
151 doc: /* Return t if OBJECT is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
152 (Lisp_Object object) |
298 | 153 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
154 if (NILP (object)) |
298 | 155 return Qt; |
156 return Qnil; | |
157 } | |
158 | |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
159 DEFUN ("type-of", Ftype_of, Stype_of, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
160 doc: /* Return a symbol representing the type of OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
161 The symbol returned names the object's basic type; |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
162 for example, (type-of 1) returns `integer'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
163 (Lisp_Object object) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
164 { |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
165 switch (XTYPE (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
166 { |
105885
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
167 case_Lisp_Int: |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
168 return Qinteger; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
169 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
170 case Lisp_Symbol: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
171 return Qsymbol; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
172 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
173 case Lisp_String: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
174 return Qstring; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
175 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
176 case Lisp_Cons: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
177 return Qcons; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
178 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
179 case Lisp_Misc: |
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
180 switch (XMISCTYPE (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
181 { |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
182 case Lisp_Misc_Marker: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
183 return Qmarker; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
184 case Lisp_Misc_Overlay: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
185 return Qoverlay; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
186 case Lisp_Misc_Float: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
187 return Qfloat; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
188 } |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
189 abort (); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
190 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
191 case Lisp_Vectorlike: |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
192 if (WINDOW_CONFIGURATIONP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
193 return Qwindow_configuration; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
194 if (PROCESSP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
195 return Qprocess; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
196 if (WINDOWP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
197 return Qwindow; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
198 if (SUBRP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
199 return Qsubr; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
200 if (COMPILEDP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
201 return Qcompiled_function; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
202 if (BUFFERP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
203 return Qbuffer; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
204 if (CHAR_TABLE_P (object)) |
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
205 return Qchar_table; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
206 if (BOOL_VECTOR_P (object)) |
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
207 return Qbool_vector; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
208 if (FRAMEP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
209 return Qframe; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
210 if (HASH_TABLE_P (object)) |
26185 | 211 return Qhash_table; |
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
212 if (FONT_SPEC_P (object)) |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
213 return Qfont_spec; |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
214 if (FONT_ENTITY_P (object)) |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
215 return Qfont_entity; |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
216 if (FONT_OBJECT_P (object)) |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
217 return Qfont_object; |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
218 return Qvector; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
219 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
220 case Lisp_Float: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
221 return Qfloat; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
222 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
223 default: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
224 abort (); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
225 } |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
226 } |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
227 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
228 DEFUN ("consp", Fconsp, Sconsp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
229 doc: /* Return t if OBJECT is a cons cell. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
230 (Lisp_Object object) |
298 | 231 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
232 if (CONSP (object)) |
298 | 233 return Qt; |
234 return Qnil; | |
235 } | |
236 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
237 DEFUN ("atom", Fatom, Satom, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
238 doc: /* Return t if OBJECT is not a cons cell. This includes nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
239 (Lisp_Object object) |
298 | 240 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
241 if (CONSP (object)) |
298 | 242 return Qnil; |
243 return Qt; | |
244 } | |
245 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
246 DEFUN ("listp", Flistp, Slistp, 1, 1, 0, |
68497 | 247 doc: /* Return t if OBJECT is a list, that is, a cons cell or nil. |
248 Otherwise, return nil. */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
249 (Lisp_Object object) |
298 | 250 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
251 if (CONSP (object) || NILP (object)) |
298 | 252 return Qt; |
253 return Qnil; | |
254 } | |
255 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
256 DEFUN ("nlistp", Fnlistp, Snlistp, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
257 doc: /* Return t if OBJECT is not a list. Lists include nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
258 (Lisp_Object object) |
298 | 259 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
260 if (CONSP (object) || NILP (object)) |
298 | 261 return Qnil; |
262 return Qt; | |
263 } | |
264 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
265 DEFUN ("symbolp", Fsymbolp, Ssymbolp, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
266 doc: /* Return t if OBJECT is a symbol. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
267 (Lisp_Object object) |
298 | 268 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
269 if (SYMBOLP (object)) |
298 | 270 return Qt; |
271 return Qnil; | |
272 } | |
273 | |
26931 | 274 /* Define this in C to avoid unnecessarily consing up the symbol |
275 name. */ | |
276 DEFUN ("keywordp", Fkeywordp, Skeywordp, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
277 doc: /* Return t if OBJECT is a keyword. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
278 This means that it is a symbol with a print name beginning with `:' |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
279 interned in the initial obarray. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
280 (Lisp_Object object) |
26931 | 281 { |
282 if (SYMBOLP (object) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
283 && SREF (SYMBOL_NAME (object), 0) == ':' |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
284 && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object)) |
26931 | 285 return Qt; |
286 return Qnil; | |
287 } | |
288 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
289 DEFUN ("vectorp", Fvectorp, Svectorp, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
290 doc: /* Return t if OBJECT is a vector. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
291 (Lisp_Object object) |
298 | 292 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
293 if (VECTORP (object)) |
298 | 294 return Qt; |
295 return Qnil; | |
296 } | |
297 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
298 DEFUN ("stringp", Fstringp, Sstringp, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
299 doc: /* Return t if OBJECT is a string. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
300 (Lisp_Object object) |
298 | 301 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
302 if (STRINGP (object)) |
298 | 303 return Qt; |
304 return Qnil; | |
305 } | |
306 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
307 DEFUN ("multibyte-string-p", Fmultibyte_string_p, Smultibyte_string_p, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
308 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
309 doc: /* Return t if OBJECT is a multibyte string. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
310 (Lisp_Object object) |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
311 { |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
312 if (STRINGP (object) && STRING_MULTIBYTE (object)) |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
313 return Qt; |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
314 return Qnil; |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
315 } |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
316 |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
317 DEFUN ("char-table-p", Fchar_table_p, Schar_table_p, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
318 doc: /* Return t if OBJECT is a char-table. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
319 (Lisp_Object object) |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
320 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
321 if (CHAR_TABLE_P (object)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
322 return Qt; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
323 return Qnil; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
324 } |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
325 |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
326 DEFUN ("vector-or-char-table-p", Fvector_or_char_table_p, |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
327 Svector_or_char_table_p, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
328 doc: /* Return t if OBJECT is a char-table or vector. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
329 (Lisp_Object object) |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
330 { |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
331 if (VECTORP (object) || CHAR_TABLE_P (object)) |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
332 return Qt; |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
333 return Qnil; |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
334 } |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
335 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
336 DEFUN ("bool-vector-p", Fbool_vector_p, Sbool_vector_p, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
337 doc: /* Return t if OBJECT is a bool-vector. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
338 (Lisp_Object object) |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
339 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
340 if (BOOL_VECTOR_P (object)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
341 return Qt; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
342 return Qnil; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
343 } |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
344 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
345 DEFUN ("arrayp", Farrayp, Sarrayp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
346 doc: /* Return t if OBJECT is an array (string or vector). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
347 (Lisp_Object object) |
298 | 348 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
349 if (ARRAYP (object)) |
298 | 350 return Qt; |
351 return Qnil; | |
352 } | |
353 | |
354 DEFUN ("sequencep", Fsequencep, Ssequencep, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
355 doc: /* Return t if OBJECT is a sequence (list or array). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
356 (register Lisp_Object object) |
298 | 357 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
358 if (CONSP (object) || NILP (object) || ARRAYP (object)) |
298 | 359 return Qt; |
360 return Qnil; | |
361 } | |
362 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
363 DEFUN ("bufferp", Fbufferp, Sbufferp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
364 doc: /* Return t if OBJECT is an editor buffer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
365 (Lisp_Object object) |
298 | 366 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
367 if (BUFFERP (object)) |
298 | 368 return Qt; |
369 return Qnil; | |
370 } | |
371 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
372 DEFUN ("markerp", Fmarkerp, Smarkerp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
373 doc: /* Return t if OBJECT is a marker (editor pointer). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
374 (Lisp_Object object) |
298 | 375 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
376 if (MARKERP (object)) |
298 | 377 return Qt; |
378 return Qnil; | |
379 } | |
380 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
381 DEFUN ("subrp", Fsubrp, Ssubrp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
382 doc: /* Return t if OBJECT is a built-in function. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
383 (Lisp_Object object) |
298 | 384 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
385 if (SUBRP (object)) |
298 | 386 return Qt; |
387 return Qnil; | |
388 } | |
389 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
390 DEFUN ("byte-code-function-p", Fbyte_code_function_p, Sbyte_code_function_p, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
391 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
392 doc: /* Return t if OBJECT is a byte-compiled function object. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
393 (Lisp_Object object) |
298 | 394 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
395 if (COMPILEDP (object)) |
298 | 396 return Qt; |
397 return Qnil; | |
398 } | |
399 | |
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
400 DEFUN ("char-or-string-p", Fchar_or_string_p, Schar_or_string_p, 1, 1, 0, |
91019
57f4ffc03d13
(Fchar_or_string_p): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
90996
diff
changeset
|
401 doc: /* Return t if OBJECT is a character or a string. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
402 (register Lisp_Object object) |
298 | 403 { |
88623
0d7705c8ee3c
(Fchar_or_string_p): Doc fix. Use CHARACTERP.
Dave Love <fx@gnu.org>
parents:
88368
diff
changeset
|
404 if (CHARACTERP (object) || STRINGP (object)) |
298 | 405 return Qt; |
406 return Qnil; | |
407 } | |
408 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
409 DEFUN ("integerp", Fintegerp, Sintegerp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
410 doc: /* Return t if OBJECT is an integer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
411 (Lisp_Object object) |
298 | 412 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
413 if (INTEGERP (object)) |
298 | 414 return Qt; |
415 return Qnil; | |
416 } | |
417 | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
418 DEFUN ("integer-or-marker-p", Finteger_or_marker_p, Sinteger_or_marker_p, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
419 doc: /* Return t if OBJECT is an integer or a marker (editor pointer). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
420 (register Lisp_Object object) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
421 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
422 if (MARKERP (object) || INTEGERP (object)) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
423 return Qt; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
424 return Qnil; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
425 } |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
426 |
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
427 DEFUN ("natnump", Fnatnump, Snatnump, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
428 doc: /* Return t if OBJECT is a nonnegative integer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
429 (Lisp_Object object) |
298 | 430 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
431 if (NATNUMP (object)) |
298 | 432 return Qt; |
433 return Qnil; | |
434 } | |
435 | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
436 DEFUN ("numberp", Fnumberp, Snumberp, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
437 doc: /* Return t if OBJECT is a number (floating point or integer). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
438 (Lisp_Object object) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
439 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
440 if (NUMBERP (object)) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
441 return Qt; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
442 else |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
443 return Qnil; |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
444 } |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
445 |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
446 DEFUN ("number-or-marker-p", Fnumber_or_marker_p, |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
447 Snumber_or_marker_p, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
448 doc: /* Return t if OBJECT is a number or a marker. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
449 (Lisp_Object object) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
450 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
451 if (NUMBERP (object) || MARKERP (object)) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
452 return Qt; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
453 return Qnil; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
454 } |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
455 |
298 | 456 DEFUN ("floatp", Ffloatp, Sfloatp, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
457 doc: /* Return t if OBJECT is a floating point number. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
458 (Lisp_Object object) |
298 | 459 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
460 if (FLOATP (object)) |
298 | 461 return Qt; |
462 return Qnil; | |
463 } | |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
464 |
298 | 465 |
466 /* Extract and set components of lists */ | |
467 | |
468 DEFUN ("car", Fcar, Scar, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
469 doc: /* Return the car of LIST. If arg is nil, return nil. |
68444
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
470 Error if arg is not nil and not a cons cell. See also `car-safe'. |
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
471 |
68446
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
472 See Info node `(elisp)Cons Cells' for a discussion of related basic |
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
473 Lisp concepts such as car, cdr, cons cell and list. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
474 (register Lisp_Object list) |
298 | 475 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
476 return CAR (list); |
298 | 477 } |
478 | |
479 DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
480 doc: /* Return the car of OBJECT if it is a cons cell, or else nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
481 (Lisp_Object object) |
298 | 482 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
483 return CAR_SAFE (object); |
298 | 484 } |
485 | |
486 DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
487 doc: /* Return the cdr of LIST. If arg is nil, return nil. |
68444
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
488 Error if arg is not nil and not a cons cell. See also `cdr-safe'. |
3eb2a97faeda
(Fcar, Fcdr): Add links to Elisp manual to the docstrings.
Luc Teirlinck <teirllm@auburn.edu>
parents:
66542
diff
changeset
|
489 |
68446
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
490 See Info node `(elisp)Cons Cells' for a discussion of related basic |
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
491 Lisp concepts such as cdr, car, cons cell and list. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
492 (register Lisp_Object list) |
298 | 493 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
494 return CDR (list); |
298 | 495 } |
496 | |
497 DEFUN ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
498 doc: /* Return the cdr of OBJECT if it is a cons cell, or else nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
499 (Lisp_Object object) |
298 | 500 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
501 return CDR_SAFE (object); |
298 | 502 } |
503 | |
504 DEFUN ("setcar", Fsetcar, Ssetcar, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
505 doc: /* Set the car of CELL to be NEWCAR. Returns NEWCAR. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
506 (register Lisp_Object cell, Lisp_Object newcar) |
298 | 507 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
508 CHECK_CONS (cell); |
298 | 509 CHECK_IMPURE (cell); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
510 XSETCAR (cell, newcar); |
298 | 511 return newcar; |
512 } | |
513 | |
514 DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
515 doc: /* Set the cdr of CELL to be NEWCDR. Returns NEWCDR. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
516 (register Lisp_Object cell, Lisp_Object newcdr) |
298 | 517 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
518 CHECK_CONS (cell); |
298 | 519 CHECK_IMPURE (cell); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39775
diff
changeset
|
520 XSETCDR (cell, newcdr); |
298 | 521 return newcdr; |
522 } | |
523 | |
524 /* Extract and set components of symbols */ | |
525 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
526 DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
527 doc: /* Return t if SYMBOL's value is not void. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
528 (register Lisp_Object symbol) |
298 | 529 { |
530 Lisp_Object valcontents; | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
531 struct Lisp_Symbol *sym; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
532 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
533 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
534 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
535 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
536 switch (sym->redirect) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
537 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
538 case SYMBOL_PLAINVAL: valcontents = SYMBOL_VAL (sym); break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
539 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
540 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
541 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
542 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
543 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
544 /* In set_internal, we un-forward vars when their value is |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
545 set to Qunbound. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
546 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
547 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
548 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
549 swap_in_symval_forwarding (sym, blv); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
550 valcontents = BLV_VALUE (blv); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
551 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
552 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
553 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
554 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
555 /* In set_internal, we un-forward vars when their value is |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
556 set to Qunbound. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
557 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
558 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
559 } |
298 | 560 |
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
561 return (EQ (valcontents, Qunbound) ? Qnil : Qt); |
298 | 562 } |
563 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
564 DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
565 doc: /* Return t if SYMBOL's function definition is not void. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
566 (register Lisp_Object symbol) |
298 | 567 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
568 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
569 return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt); |
298 | 570 } |
571 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
572 DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
573 doc: /* Make SYMBOL's value be void. |
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
574 Return SYMBOL. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
575 (register Lisp_Object symbol) |
298 | 576 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
577 CHECK_SYMBOL (symbol); |
73838
a99be0fe5bd4
(Fmakunbound): Use SYMBOL_CONSTANT_P macro.
Juanma Barranquero <lekktu@gmail.com>
parents:
71973
diff
changeset
|
578 if (SYMBOL_CONSTANT_P (symbol)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
579 xsignal1 (Qsetting_constant, symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
580 Fset (symbol, Qunbound); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
581 return symbol; |
298 | 582 } |
583 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
584 DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0, |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
585 doc: /* Make SYMBOL's function definition be void. |
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
586 Return SYMBOL. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
587 (register Lisp_Object symbol) |
298 | 588 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
589 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
590 if (NILP (symbol) || EQ (symbol, Qt)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
591 xsignal1 (Qsetting_constant, symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
592 XSYMBOL (symbol)->function = Qunbound; |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
593 return symbol; |
298 | 594 } |
595 | |
596 DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
597 doc: /* Return SYMBOL's function definition. Error if that is void. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
598 (register Lisp_Object symbol) |
298 | 599 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
600 CHECK_SYMBOL (symbol); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
601 if (!EQ (XSYMBOL (symbol)->function, Qunbound)) |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
602 return XSYMBOL (symbol)->function; |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
603 xsignal1 (Qvoid_function, symbol); |
298 | 604 } |
605 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
606 DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
607 doc: /* Return SYMBOL's property list. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
608 (register Lisp_Object symbol) |
298 | 609 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
610 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
611 return XSYMBOL (symbol)->plist; |
298 | 612 } |
613 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
614 DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
615 doc: /* Return SYMBOL's name, a string. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
616 (register Lisp_Object symbol) |
298 | 617 { |
618 register Lisp_Object name; | |
619 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
620 CHECK_SYMBOL (symbol); |
45397
bc5d63652a0a
* data.c (Fkeywordp, Fsymbol_name, store_symval_forwarding)
Ken Raeburn <raeburn@raeburn.org>
parents:
42274
diff
changeset
|
621 name = SYMBOL_NAME (symbol); |
298 | 622 return name; |
623 } | |
624 | |
625 DEFUN ("fset", Ffset, Sfset, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
626 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
627 (register Lisp_Object symbol, Lisp_Object definition) |
298 | 628 { |
79083
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
629 register Lisp_Object function; |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
630 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
631 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
632 if (NILP (symbol) || EQ (symbol, Qt)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
633 xsignal1 (Qsetting_constant, symbol); |
79083
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
634 |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
635 function = XSYMBOL (symbol)->function; |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
636 |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
637 if (!NILP (Vautoload_queue) && !EQ (function, Qunbound)) |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
638 Vautoload_queue = Fcons (Fcons (symbol, function), Vautoload_queue); |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
639 |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
640 if (CONSP (function) && EQ (XCAR (function), Qautoload)) |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
641 Fput (symbol, Qautoload, XCDR (function)); |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
642 |
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
643 XSYMBOL (symbol)->function = definition; |
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
644 /* Handle automatic advice activation */ |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
645 if (CONSP (XSYMBOL (symbol)->plist) && !NILP (Fget (symbol, Qad_advice_info))) |
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
646 { |
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
647 call2 (Qad_activate_internal, symbol, Qnil); |
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
648 definition = XSYMBOL (symbol)->function; |
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
649 } |
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
650 return definition; |
298 | 651 } |
652 | |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
653 DEFUN ("defalias", Fdefalias, Sdefalias, 2, 3, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
654 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. |
46521 | 655 Associates the function with the current load file, if any. |
656 The optional third argument DOCSTRING specifies the documentation string | |
657 for SYMBOL; if it is omitted or nil, SYMBOL uses the documentation string | |
658 determined by DEFINITION. */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
659 (register Lisp_Object symbol, Lisp_Object definition, Lisp_Object docstring) |
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
660 { |
65600
bd15c2b64526
(Fdefalias): Signal an error if SYMBOL is not a symbol.
John Paul Wallington <jpw@pobox.com>
parents:
64770
diff
changeset
|
661 CHECK_SYMBOL (symbol); |
48723
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
662 if (CONSP (XSYMBOL (symbol)->function) |
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
663 && EQ (XCAR (XSYMBOL (symbol)->function), Qautoload)) |
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
664 LOADHIST_ATTACH (Fcons (Qt, symbol)); |
25132
07b44154638f
(Fdefalias): Call Ffset instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
23602
diff
changeset
|
665 definition = Ffset (symbol, definition); |
59110
5feed0f86f52
(Fdefalias): Use (defun . FN_NAME) in LOADHIST_ATTACH.
Richard M. Stallman <rms@gnu.org>
parents:
58986
diff
changeset
|
666 LOADHIST_ATTACH (Fcons (Qdefun, symbol)); |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
667 if (!NILP (docstring)) |
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
668 Fput (symbol, Qfunction_documentation, docstring); |
16756
71113ba79b1b
(Fdefalias): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16754
diff
changeset
|
669 return definition; |
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
670 } |
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
671 |
298 | 672 DEFUN ("setplist", Fsetplist, Ssetplist, 2, 2, 0, |
52938 | 673 doc: /* Set SYMBOL's property list to NEWPLIST, and return NEWPLIST. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
674 (register Lisp_Object symbol, Lisp_Object newplist) |
298 | 675 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
676 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
677 XSYMBOL (symbol)->plist = newplist; |
298 | 678 return newplist; |
679 } | |
648 | 680 |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
681 DEFUN ("subr-arity", Fsubr_arity, Ssubr_arity, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
682 doc: /* Return minimum and maximum number of args allowed for SUBR. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
683 SUBR must be a built-in function. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
684 The returned value is a pair (MIN . MAX). MIN is the minimum number |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
685 of args. MAX is the maximum number or the symbol `many', for a |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
686 function with `&rest' args, or `unevalled' for a special form. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
687 (Lisp_Object subr) |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
688 { |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
689 short minargs, maxargs; |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
690 CHECK_SUBR (subr); |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
691 minargs = XSUBR (subr)->min_args; |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
692 maxargs = XSUBR (subr)->max_args; |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
693 if (maxargs == MANY) |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
694 return Fcons (make_number (minargs), Qmany); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
695 else if (maxargs == UNEVALLED) |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
696 return Fcons (make_number (minargs), Qunevalled); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
697 else |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
698 return Fcons (make_number (minargs), make_number (maxargs)); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
699 } |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
700 |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
701 DEFUN ("subr-name", Fsubr_name, Ssubr_name, 1, 1, 0, |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
702 doc: /* Return name of subroutine SUBR. |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
703 SUBR must be a built-in function. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
704 (Lisp_Object subr) |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
705 { |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
706 const char *name; |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
707 CHECK_SUBR (subr); |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
708 name = XSUBR (subr)->symbol_name; |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
709 return make_string (name, strlen (name)); |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
710 } |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
711 |
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
712 DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
713 doc: /* Return the interactive form of CMD or nil if none. |
56590
f48e32fbfc6c
(Finteractive_form): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56193
diff
changeset
|
714 If CMD is not a command, the return value is nil. |
f48e32fbfc6c
(Finteractive_form): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56193
diff
changeset
|
715 Value, if non-nil, is a list \(interactive SPEC). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
716 (Lisp_Object cmd) |
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
717 { |
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
718 Lisp_Object fun = indirect_function (cmd); /* Check cycles. */ |
85292
3fd2159a6a89
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
84438
diff
changeset
|
719 |
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
720 if (NILP (fun) || EQ (fun, Qunbound)) |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
721 return Qnil; |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
722 |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
723 /* Use an `interactive-form' property if present, analogous to the |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
724 function-documentation property. */ |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
725 fun = cmd; |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
726 while (SYMBOLP (fun)) |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
727 { |
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
728 Lisp_Object tmp = Fget (fun, Qinteractive_form); |
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
729 if (!NILP (tmp)) |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
730 return tmp; |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
731 else |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
732 fun = Fsymbol_function (fun); |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
733 } |
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
734 |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
735 if (SUBRP (fun)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
736 { |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
737 const char *spec = XSUBR (fun)->intspec; |
84438
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
738 if (spec) |
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
739 return list2 (Qinteractive, |
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
740 (*spec != '(') ? build_string (spec) : |
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
741 Fcar (Fread_from_string (build_string (spec), Qnil, Qnil))); |
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
742 } |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
743 else if (COMPILEDP (fun)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
744 { |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
745 if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) > COMPILED_INTERACTIVE) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
746 return list2 (Qinteractive, AREF (fun, COMPILED_INTERACTIVE)); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
747 } |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
748 else if (CONSP (fun)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
749 { |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
750 Lisp_Object funcar = XCAR (fun); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
751 if (EQ (funcar, Qlambda)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
752 return Fassq (Qinteractive, Fcdr (XCDR (fun))); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
753 else if (EQ (funcar, Qautoload)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
754 { |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
755 struct gcpro gcpro1; |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
756 GCPRO1 (cmd); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
757 do_autoload (fun, cmd); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
758 UNGCPRO; |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
759 return Finteractive_form (cmd); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
760 } |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
761 } |
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
762 return Qnil; |
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
763 } |
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
764 |
298 | 765 |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
766 /*********************************************************************** |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
767 Getting and Setting Values of Symbols |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
768 ***********************************************************************/ |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
769 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
770 /* Return the symbol holding SYMBOL's value. Signal |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
771 `cyclic-variable-indirection' if SYMBOL's chain of variable |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
772 indirections contains a loop. */ |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
773 |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
774 struct Lisp_Symbol * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
775 indirect_variable (struct Lisp_Symbol *symbol) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
776 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
777 struct Lisp_Symbol *tortoise, *hare; |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
778 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
779 hare = tortoise = symbol; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
780 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
781 while (hare->redirect == SYMBOL_VARALIAS) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
782 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
783 hare = SYMBOL_ALIAS (hare); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
784 if (hare->redirect != SYMBOL_VARALIAS) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
785 break; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
786 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
787 hare = SYMBOL_ALIAS (hare); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
788 tortoise = SYMBOL_ALIAS (tortoise); |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
789 |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
790 if (hare == tortoise) |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
791 { |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
792 Lisp_Object tem; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
793 XSETSYMBOL (tem, symbol); |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
794 xsignal1 (Qcyclic_variable_indirection, tem); |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
795 } |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
796 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
797 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
798 return hare; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
799 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
800 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
801 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
802 DEFUN ("indirect-variable", Findirect_variable, Sindirect_variable, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
803 doc: /* Return the variable at the end of OBJECT's variable chain. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
804 If OBJECT is a symbol, follow all variable indirections and return the final |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
805 variable. If OBJECT is not a symbol, just return it. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
806 Signal a cyclic-variable-indirection error if there is a loop in the |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
807 variable chain of symbols. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
808 (Lisp_Object object) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
809 { |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
810 if (SYMBOLP (object)) |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
811 XSETSYMBOL (object, indirect_variable (XSYMBOL (object))); |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
812 return object; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
813 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
814 |
298 | 815 |
816 /* Given the raw contents of a symbol value cell, | |
817 return the Lisp value of the symbol. | |
818 This does not handle buffer-local variables; use | |
819 swap_in_symval_forwarding for that. */ | |
820 | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
821 #define do_blv_forwarding(blv) \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
822 ((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
823 |
298 | 824 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
825 do_symval_forwarding (register union Lisp_Fwd *valcontents) |
298 | 826 { |
827 register Lisp_Object val; | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
828 switch (XFWDTYPE (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
829 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
830 case Lisp_Fwd_Int: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
831 XSETINT (val, *XINTFWD (valcontents)->intvar); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
832 return val; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
833 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
834 case Lisp_Fwd_Bool: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
835 return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
836 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
837 case Lisp_Fwd_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
838 return *XOBJFWD (valcontents)->objvar; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
839 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
840 case Lisp_Fwd_Buffer_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
841 return PER_BUFFER_VALUE (current_buffer, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
842 XBUFFER_OBJFWD (valcontents)->offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
843 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
844 case Lisp_Fwd_Kboard_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
845 /* We used to simply use current_kboard here, but from Lisp |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
846 code, it's value is often unexpected. It seems nicer to |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
847 allow constructions like this to work as intuitively expected: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
848 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
849 (with-selected-frame frame |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
850 (define-key local-function-map "\eOP" [f1])) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
851 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
852 On the other hand, this affects the semantics of |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
853 last-command and real-last-command, and people may rely on |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
854 that. I took a quick look at the Lisp codebase, and I |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
855 don't think anything will break. --lorentey */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
856 return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
857 + (char *)FRAME_KBOARD (SELECTED_FRAME ())); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
858 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
859 } |
298 | 860 } |
861 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
862 /* Store NEWVAL into SYMBOL, where VALCONTENTS is found in the value cell |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
863 of SYMBOL. If SYMBOL is buffer-local, VALCONTENTS should be the |
298 | 864 buffer-independent contents of the value cell: forwarded just one |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
865 step past the buffer-localness. |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
866 |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
867 BUF non-zero means set the value in buffer BUF instead of the |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
868 current buffer. This only plays a role for per-buffer variables. */ |
298 | 869 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
870 #define store_blv_forwarding(blv, newval, buf) \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
871 do { \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
872 if ((blv)->forwarded) \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
873 store_symval_forwarding (BLV_FWD (blv), (newval), (buf)); \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
874 else \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
875 SET_BLV_VALUE (blv, newval); \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
876 } while (0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
877 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
878 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
879 store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf) |
298 | 880 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
881 switch (XFWDTYPE (valcontents)) |
298 | 882 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
883 case Lisp_Fwd_Int: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
884 CHECK_NUMBER (newval); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
885 *XINTFWD (valcontents)->intvar = XINT (newval); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
886 break; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
887 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
888 case Lisp_Fwd_Bool: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
889 *XBOOLFWD (valcontents)->boolvar = !NILP (newval); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
890 break; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
891 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
892 case Lisp_Fwd_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
893 *XOBJFWD (valcontents)->objvar = newval; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
894 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
895 /* If this variable is a default for something stored |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
896 in the buffer itself, such as default-fill-column, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
897 find the buffers that don't have local values for it |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
898 and update them. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
899 if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
900 && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1)) |
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
901 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
902 int offset = ((char *) XOBJFWD (valcontents)->objvar |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
903 - (char *) &buffer_defaults); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
904 int idx = PER_BUFFER_IDX (offset); |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
905 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
906 Lisp_Object tail; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
907 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
908 if (idx <= 0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
909 break; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
910 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
911 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
53365
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
912 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
913 Lisp_Object buf; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
914 struct buffer *b; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
915 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
916 buf = Fcdr (XCAR (tail)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
917 if (!BUFFERP (buf)) continue; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
918 b = XBUFFER (buf); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
919 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
920 if (! PER_BUFFER_VALUE_P (b, idx)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
921 PER_BUFFER_VALUE (b, offset) = newval; |
53365
3ca4a81861a1
(store_symval_forwarding): Handle setting default-fill-column, etc.,
Richard M. Stallman <rms@gnu.org>
parents:
53110
diff
changeset
|
922 } |
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
923 } |
298 | 924 break; |
925 | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
926 case Lisp_Fwd_Buffer_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
927 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
928 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
929 Lisp_Object type = XBUFFER_OBJFWD (valcontents)->slottype; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
930 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
931 if (!(NILP (type) || NILP (newval) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
932 || (XINT (type) == LISP_INT_TAG |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
933 ? INTEGERP (newval) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
934 : XTYPE (newval) == XINT (type)))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
935 buffer_slot_type_mismatch (newval, XINT (type)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
936 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
937 if (buf == NULL) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
938 buf = current_buffer; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
939 PER_BUFFER_VALUE (buf, offset) = newval; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
940 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
941 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
942 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
943 case Lisp_Fwd_Kboard_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
944 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
945 char *base = (char *) FRAME_KBOARD (SELECTED_FRAME ()); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
946 char *p = base + XKBOARD_OBJFWD (valcontents)->offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
947 *(Lisp_Object *) p = newval; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
948 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
949 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
950 |
298 | 951 default: |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
952 abort (); /* goto def; */ |
298 | 953 } |
954 } | |
955 | |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
956 /* Set up SYMBOL to refer to its global binding. |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
957 This makes it safe to alter the status of other bindings. */ |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
958 |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
959 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
960 swap_in_global_binding (struct Lisp_Symbol *symbol) |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
961 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
962 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (symbol); |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
963 |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
964 /* Unload the previously loaded binding. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
965 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
966 SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd)); |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
967 |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
968 /* Select the global binding in the symbol. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
969 blv->valcell = blv->defcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
970 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
971 store_symval_forwarding (blv->fwd, XCDR (blv->defcell), NULL); |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
972 |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
973 /* Indicate that the global binding is set up now. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
974 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
975 SET_BLV_FOUND (blv, 0); |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
976 } |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
977 |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
978 /* Set up the buffer-local symbol SYMBOL for validity in the current buffer. |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
979 VALCONTENTS is the contents of its value cell, |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
980 which points to a struct Lisp_Buffer_Local_Value. |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
981 |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
982 Return the value forwarded one step past the buffer-local stage. |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
983 This could be another forwarding pointer. */ |
298 | 984 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
985 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
986 swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_Value *blv) |
298 | 987 { |
988 register Lisp_Object tem1; | |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
989 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
990 eassert (blv == SYMBOL_BLV (symbol)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
991 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
992 tem1 = blv->where; |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
993 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
994 if (NILP (tem1) |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
995 || (blv->frame_local |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
996 ? !EQ (selected_frame, tem1) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
997 : current_buffer != XBUFFER (tem1))) |
298 | 998 { |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
999 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1000 /* Unload the previously loaded binding. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1001 tem1 = blv->valcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1002 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1003 SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd)); |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1004 /* Choose the new binding. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1005 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1006 Lisp_Object var; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1007 XSETSYMBOL (var, symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1008 if (blv->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1009 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1010 tem1 = assq_no_quit (var, XFRAME (selected_frame)->param_alist); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1011 blv->where = selected_frame; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1012 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1013 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1014 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1015 tem1 = assq_no_quit (var, current_buffer->local_var_alist); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1016 XSETBUFFER (blv->where, current_buffer); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1017 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1018 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1019 if (!(blv->found = !NILP (tem1))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1020 tem1 = blv->defcell; |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1021 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1022 /* Load the new binding. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1023 blv->valcell = tem1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1024 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1025 store_symval_forwarding (blv->fwd, BLV_VALUE (blv), NULL); |
298 | 1026 } |
1027 } | |
1028 | |
514 | 1029 /* Find the value of a symbol, returning Qunbound if it's not bound. |
1030 This is helpful for code which just wants to get a variable's value | |
14036 | 1031 if it has one, without signaling an error. |
514 | 1032 Note that it must not be possible to quit |
1033 within this function. Great care is required for this. */ | |
298 | 1034 |
514 | 1035 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1036 find_symbol_value (Lisp_Object symbol) |
298 | 1037 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1038 struct Lisp_Symbol *sym; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
1039 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1040 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1041 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1042 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1043 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1044 switch (sym->redirect) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1045 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1046 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1047 case SYMBOL_PLAINVAL: return SYMBOL_VAL (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1048 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1049 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1050 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1051 swap_in_symval_forwarding (sym, blv); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1052 return blv->fwd ? do_symval_forwarding (blv->fwd) : BLV_VALUE (blv); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1053 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1054 /* FALLTHROUGH */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1055 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1056 return do_symval_forwarding (SYMBOL_FWD (sym)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1057 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1058 } |
298 | 1059 } |
1060 | |
514 | 1061 DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1062 doc: /* Return SYMBOL's value. Error if that is void. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1063 (Lisp_Object symbol) |
514 | 1064 { |
6497
89ff61b53cee
(store_symval_forwarding, Fsymbol_value): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6459
diff
changeset
|
1065 Lisp_Object val; |
514 | 1066 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1067 val = find_symbol_value (symbol); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1068 if (!EQ (val, Qunbound)) |
514 | 1069 return val; |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1070 |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1071 xsignal1 (Qvoid_variable, symbol); |
514 | 1072 } |
1073 | |
298 | 1074 DEFUN ("set", Fset, Sset, 2, 2, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1075 doc: /* Set SYMBOL's value to NEWVAL, and return NEWVAL. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1076 (register Lisp_Object symbol, Lisp_Object newval) |
298 | 1077 { |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1078 set_internal (symbol, newval, Qnil, 0); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1079 return newval; |
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1080 } |
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1081 |
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1082 /* Return 1 if SYMBOL currently has a let-binding |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1083 which was made in the buffer that is now current. */ |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1084 |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1085 static int |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1086 let_shadows_buffer_binding_p (struct Lisp_Symbol *symbol) |
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1087 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1088 struct specbinding *p; |
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1089 |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1090 for (p = specpdl_ptr - 1; p >= specpdl; p--) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1091 if (p->func == NULL |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1092 && CONSP (p->symbol)) |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1093 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1094 struct Lisp_Symbol *let_bound_symbol = XSYMBOL (XCAR (p->symbol)); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1095 eassert (let_bound_symbol->redirect != SYMBOL_VARALIAS); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1096 if (symbol == let_bound_symbol |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1097 && XBUFFER (XCDR (XCDR (p->symbol))) == current_buffer) |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1098 break; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1099 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1100 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1101 return p >= specpdl; |
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1102 } |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1103 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1104 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1105 let_shadows_global_binding_p (Lisp_Object symbol) |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1106 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1107 struct specbinding *p; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1108 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1109 for (p = specpdl_ptr - 1; p >= specpdl; p--) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1110 if (p->func == NULL && EQ (p->symbol, symbol)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1111 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1112 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1113 return p >= specpdl; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1114 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1115 |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1116 /* Store the value NEWVAL into SYMBOL. |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1117 If buffer/frame-locality is an issue, WHERE specifies which context to use. |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1118 (nil stands for the current buffer/frame). |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1119 |
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1120 If BINDFLAG is zero, then if this symbol is supposed to become |
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1121 local in every buffer where it is set, then we make it local. |
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1122 If BINDFLAG is nonzero, we don't do that. */ |
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1123 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1124 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1125 set_internal (register Lisp_Object symbol, register Lisp_Object newval, register Lisp_Object where, int bindflag) |
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1126 { |
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1127 int voide = EQ (newval, Qunbound); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1128 struct Lisp_Symbol *sym; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1129 Lisp_Object tem1; |
298 | 1130 |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1131 /* If restoring in a dead buffer, do nothing. */ |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1132 /* if (BUFFERP (where) && NILP (XBUFFER (where)->name)) |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1133 return; */ |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1134 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1135 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1136 if (SYMBOL_CONSTANT_P (symbol)) |
298 | 1137 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1138 if (NILP (Fkeywordp (symbol)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1139 || !EQ (newval, Fsymbol_value (symbol))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1140 xsignal1 (Qsetting_constant, symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1141 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1142 /* Allow setting keywords to their own value. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1143 return; |
298 | 1144 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1145 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1146 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1147 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1148 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1149 switch (sym->redirect) |
298 | 1150 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1151 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1152 case SYMBOL_PLAINVAL: SET_SYMBOL_VAL (sym , newval); return; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1153 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1154 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1155 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1156 if (NILP (where)) |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1157 { |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1158 if (blv->frame_local) |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1159 where = selected_frame; |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1160 else |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1161 XSETBUFFER (where, current_buffer); |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1162 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1163 /* If the current buffer is not the buffer whose binding is |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1164 loaded, or if there may be frame-local bindings and the frame |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1165 isn't the right one, or if it's a Lisp_Buffer_Local_Value and |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1166 the default binding is loaded, the loaded binding may be the |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1167 wrong one. */ |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1168 if (!EQ (blv->where, where) |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1169 /* Also unload a global binding (if the var is local_if_set). */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1170 || (EQ (blv->valcell, blv->defcell))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1171 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1172 /* The currently loaded binding is not necessarily valid. |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1173 We need to unload it, and choose a new binding. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1174 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1175 /* Write out `realvalue' to the old loaded binding. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1176 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1177 SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1178 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1179 /* Find the new binding. */ |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1180 XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1181 tem1 = Fassq (symbol, |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1182 (blv->frame_local |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1183 ? XFRAME (where)->param_alist |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1184 : XBUFFER (where)->local_var_alist)); |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1185 blv->where = where; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1186 blv->found = 1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1187 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1188 if (NILP (tem1)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1189 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1190 /* This buffer still sees the default value. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1191 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1192 /* If the variable is a Lisp_Some_Buffer_Local_Value, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1193 or if this is `let' rather than `set', |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1194 make CURRENT-ALIST-ELEMENT point to itself, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1195 indicating that we're seeing the default value. |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1196 Likewise if the variable has been let-bound |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1197 in the current buffer. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1198 if (bindflag || !blv->local_if_set |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1199 || let_shadows_buffer_binding_p (sym)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1200 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1201 blv->found = 0; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1202 tem1 = blv->defcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1203 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1204 /* If it's a local_if_set, being set not bound, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1205 and we're not within a let that was made for this buffer, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1206 create a new buffer-local binding for the variable. |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1207 That means, give this buffer a new assoc for a local value |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1208 and load that binding. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1209 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1210 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1211 /* local_if_set is only supported for buffer-local |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1212 bindings, not for frame-local bindings. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1213 eassert (!blv->frame_local); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1214 tem1 = Fcons (symbol, XCDR (blv->defcell)); |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1215 XBUFFER (where)->local_var_alist |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1216 = Fcons (tem1, XBUFFER (where)->local_var_alist); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1217 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1218 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1219 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1220 /* Record which binding is now loaded. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1221 blv->valcell = tem1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1222 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1223 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1224 /* Store the new value in the cons cell. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1225 SET_BLV_VALUE (blv, newval); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1226 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1227 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1228 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1229 if (voide) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1230 /* If storing void (making the symbol void), forward only through |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1231 buffer-local indicator, not through Lisp_Objfwd, etc. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1232 blv->fwd = NULL; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1233 else |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1234 store_symval_forwarding (blv->fwd, newval, |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1235 BUFFERP (where) |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1236 ? XBUFFER (where) : current_buffer); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1237 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1238 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1239 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1240 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1241 { |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1242 struct buffer *buf |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1243 = BUFFERP (where) ? XBUFFER (where) : current_buffer; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1244 union Lisp_Fwd *innercontents = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1245 if (BUFFER_OBJFWDP (innercontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1246 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1247 int offset = XBUFFER_OBJFWD (innercontents)->offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1248 int idx = PER_BUFFER_IDX (offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1249 if (idx > 0 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1250 && !bindflag |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1251 && !let_shadows_buffer_binding_p (sym)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1252 SET_PER_BUFFER_VALUE_P (buf, idx, 1); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1253 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1254 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1255 if (voide) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1256 { /* If storing void (making the symbol void), forward only through |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1257 buffer-local indicator, not through Lisp_Objfwd, etc. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1258 sym->redirect = SYMBOL_PLAINVAL; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1259 SET_SYMBOL_VAL (sym, newval); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1260 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1261 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1262 store_symval_forwarding (/* sym, */ innercontents, newval, buf); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1263 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1264 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1265 default: abort (); |
298 | 1266 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1267 return; |
298 | 1268 } |
1269 | |
1270 /* Access or set a buffer-local symbol's default value. */ | |
1271 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1272 /* Return the default value of SYMBOL, but don't check for voidness. |
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1273 Return Qunbound if it is void. */ |
298 | 1274 |
1275 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1276 default_value (Lisp_Object symbol) |
298 | 1277 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1278 struct Lisp_Symbol *sym; |
298 | 1279 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1280 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1281 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1282 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1283 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1284 switch (sym->redirect) |
298 | 1285 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1286 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1287 case SYMBOL_PLAINVAL: return SYMBOL_VAL (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1288 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1289 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1290 /* If var is set up for a buffer that lacks a local value for it, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1291 the current value is nominally the default value. |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1292 But the `realvalue' slot may be more up to date, since |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1293 ordinary setq stores just that slot. So use that. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1294 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1295 if (blv->fwd && EQ (blv->valcell, blv->defcell)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1296 return do_symval_forwarding (blv->fwd); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1297 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1298 return XCDR (blv->defcell); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1299 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1300 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1301 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1302 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1303 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1304 /* For a built-in buffer-local variable, get the default value |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1305 rather than letting do_symval_forwarding get the current value. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1306 if (BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1307 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1308 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1309 if (PER_BUFFER_IDX (offset) != 0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1310 return PER_BUFFER_DEFAULT (offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1311 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1312 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1313 /* For other variables, get the current value. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1314 return do_symval_forwarding (valcontents); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1315 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1316 default: abort (); |
298 | 1317 } |
1318 } | |
1319 | |
1320 DEFUN ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1321 doc: /* Return t if SYMBOL has a non-void default value. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1322 This is the value that is seen in buffers that do not have their own values |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1323 for this variable. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1324 (Lisp_Object symbol) |
298 | 1325 { |
1326 register Lisp_Object value; | |
1327 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1328 value = default_value (symbol); |
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1329 return (EQ (value, Qunbound) ? Qnil : Qt); |
298 | 1330 } |
1331 | |
1332 DEFUN ("default-value", Fdefault_value, Sdefault_value, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1333 doc: /* Return SYMBOL's default value. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1334 This is the value that is seen in buffers that do not have their own values |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1335 for this variable. The default value is meaningful for variables with |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1336 local bindings in certain buffers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1337 (Lisp_Object symbol) |
298 | 1338 { |
1339 register Lisp_Object value; | |
1340 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1341 value = default_value (symbol); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1342 if (!EQ (value, Qunbound)) |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1343 return value; |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1344 |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1345 xsignal1 (Qvoid_variable, symbol); |
298 | 1346 } |
1347 | |
1348 DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0, | |
55616
c2be5da8c8cb
(Fset_default): Make argument names match their use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55455
diff
changeset
|
1349 doc: /* Set SYMBOL's default value to VALUE. SYMBOL and VALUE are evaluated. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1350 The default value is seen in buffers that do not have their own values |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1351 for this variable. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1352 (Lisp_Object symbol, Lisp_Object value) |
298 | 1353 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1354 struct Lisp_Symbol *sym; |
298 | 1355 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1356 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1357 if (SYMBOL_CONSTANT_P (symbol)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1358 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1359 if (NILP (Fkeywordp (symbol)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1360 || !EQ (value, Fdefault_value (symbol))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1361 xsignal1 (Qsetting_constant, symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1362 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1363 /* Allow setting keywords to their own value. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1364 return value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1365 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1366 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1367 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1368 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1369 switch (sym->redirect) |
298 | 1370 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1371 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1372 case SYMBOL_PLAINVAL: return Fset (symbol, value); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1373 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1374 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1375 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1376 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1377 /* Store new value into the DEFAULT-VALUE slot. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1378 XSETCDR (blv->defcell, value); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1379 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1380 /* If the default binding is now loaded, set the REALVALUE slot too. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1381 if (blv->fwd && EQ (blv->defcell, blv->valcell)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1382 store_symval_forwarding (blv->fwd, value, NULL); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1383 return value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1384 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1385 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1386 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1387 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1388 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1389 /* Handle variables like case-fold-search that have special slots |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1390 in the buffer. |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1391 Make them work apparently like Lisp_Buffer_Local_Value variables. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1392 if (BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1393 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1394 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1395 int idx = PER_BUFFER_IDX (offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1396 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1397 PER_BUFFER_DEFAULT (offset) = value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1398 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1399 /* If this variable is not always local in all buffers, |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1400 set it in the buffers that don't nominally have a local value. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1401 if (idx > 0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1402 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1403 struct buffer *b; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1404 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1405 for (b = all_buffers; b; b = b->next) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1406 if (!PER_BUFFER_VALUE_P (b, idx)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1407 PER_BUFFER_VALUE (b, offset) = value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1408 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1409 return value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1410 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1411 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1412 return Fset (symbol, value); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1413 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1414 default: abort (); |
298 | 1415 } |
1416 } | |
1417 | |
60064
896e880eab56
(Fsetq_default): Allow no arg case.
Richard M. Stallman <rms@gnu.org>
parents:
59110
diff
changeset
|
1418 DEFUN ("setq-default", Fsetq_default, Ssetq_default, 0, UNEVALLED, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1419 doc: /* Set the default value of variable VAR to VALUE. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1420 VAR, the variable name, is literal (not evaluated); |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
1421 VALUE is an expression: it is evaluated and its value returned. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1422 The default value of a variable is seen in buffers |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1423 that do not have their own values for the variable. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1424 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1425 More generally, you can use multiple variables and values, as in |
55378
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1426 (setq-default VAR VALUE VAR VALUE...) |
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1427 This sets each VAR's default value to the corresponding VALUE. |
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1428 The VALUE for the Nth VAR can refer to the new default values |
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1429 of previous VARs. |
78140
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
1430 usage: (setq-default [VAR VALUE]...) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1431 (Lisp_Object args) |
298 | 1432 { |
1433 register Lisp_Object args_left; | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1434 register Lisp_Object val, symbol; |
298 | 1435 struct gcpro gcpro1; |
1436 | |
490 | 1437 if (NILP (args)) |
298 | 1438 return Qnil; |
1439 | |
1440 args_left = args; | |
1441 GCPRO1 (args); | |
1442 | |
1443 do | |
1444 { | |
1445 val = Feval (Fcar (Fcdr (args_left))); | |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1446 symbol = XCAR (args_left); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1447 Fset_default (symbol, val); |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1448 args_left = Fcdr (XCDR (args_left)); |
298 | 1449 } |
490 | 1450 while (!NILP (args_left)); |
298 | 1451 |
1452 UNGCPRO; | |
1453 return val; | |
1454 } | |
1455 | |
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1456 /* Lisp functions for creating and removing buffer-local variables. */ |
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1457 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1458 union Lisp_Val_Fwd |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1459 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1460 Lisp_Object value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1461 union Lisp_Fwd *fwd; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1462 }; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1463 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1464 static struct Lisp_Buffer_Local_Value * |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1465 make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1466 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1467 struct Lisp_Buffer_Local_Value *blv |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1468 = xmalloc (sizeof (struct Lisp_Buffer_Local_Value)); |
108023
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1469 Lisp_Object symbol; |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1470 Lisp_Object tem; |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1471 |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1472 XSETSYMBOL (symbol, sym); |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1473 tem = Fcons (symbol, (forwarded |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1474 ? do_symval_forwarding (valcontents.fwd) |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1475 : valcontents.value)); |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1476 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1477 /* Buffer_Local_Values cannot have as realval a buffer-local |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1478 or keyboard-local forwarding. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1479 eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1480 eassert (!(forwarded && KBOARD_OBJFWDP (valcontents.fwd))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1481 blv->fwd = forwarded ? valcontents.fwd : NULL; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1482 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1483 blv->frame_local = 0; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1484 blv->local_if_set = 0; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1485 blv->defcell = tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1486 blv->valcell = tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1487 SET_BLV_FOUND (blv, 0); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1488 return blv; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1489 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1490 |
298 | 1491 DEFUN ("make-variable-buffer-local", Fmake_variable_buffer_local, Smake_variable_buffer_local, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1492 1, 1, "vMake Variable Buffer Local: ", |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1493 doc: /* Make VARIABLE become buffer-local whenever it is set. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1494 At any time, the value for the current buffer is in effect, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1495 unless the variable has never been set in this buffer, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1496 in which case the default value is in effect. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1497 Note that binding the variable with `let', or setting it while |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1498 a `let'-style binding made in this buffer is in effect, |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
1499 does not make the variable buffer-local. Return VARIABLE. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1500 |
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1501 In most cases it is better to use `make-local-variable', |
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1502 which makes a variable local in just one buffer. |
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1503 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1504 The function `default-value' gets the default value and `set-default' sets it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1505 (register Lisp_Object variable) |
298 | 1506 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1507 struct Lisp_Symbol *sym; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1508 struct Lisp_Buffer_Local_Value *blv = NULL; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1509 union Lisp_Val_Fwd valcontents; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1510 int forwarded; |
298 | 1511 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1512 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1513 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1514 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1515 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1516 switch (sym->redirect) |
298 | 1517 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1518 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1519 case SYMBOL_PLAINVAL: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1520 forwarded = 0; valcontents.value = SYMBOL_VAL (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1521 if (EQ (valcontents.value, Qunbound)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1522 valcontents.value = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1523 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1524 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1525 blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1526 if (blv->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1527 error ("Symbol %s may not be buffer-local", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1528 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1529 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1530 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1531 forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1532 if (KBOARD_OBJFWDP (valcontents.fwd)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1533 error ("Symbol %s may not be buffer-local", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1534 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1535 else if (BUFFER_OBJFWDP (valcontents.fwd)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1536 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1537 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1538 default: abort (); |
298 | 1539 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1540 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1541 if (sym->constant) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1542 error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1543 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1544 if (!blv) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1545 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1546 blv = make_blv (sym, forwarded, valcontents); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1547 sym->redirect = SYMBOL_LOCALIZED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1548 SET_SYMBOL_BLV (sym, blv); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1549 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1550 Lisp_Object symbol; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1551 XSETSYMBOL (symbol, sym); /* In case `variable' is aliased. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1552 if (let_shadows_global_binding_p (symbol)) |
108005
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1553 message ("Making %s buffer-local while let-bound!", |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1554 SDATA (SYMBOL_NAME (variable))); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1555 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1556 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1557 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1558 blv->local_if_set = 1; |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1559 return variable; |
298 | 1560 } |
1561 | |
1562 DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1563 1, 1, "vMake Local Variable: ", |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1564 doc: /* Make VARIABLE have a separate value in the current buffer. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1565 Other buffers will continue to share a common default value. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1566 \(The buffer-local value of VARIABLE starts out as the same value |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1567 VARIABLE previously had. If VARIABLE was void, it remains void.\) |
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1568 Return VARIABLE. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1569 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1570 If the variable is already arranged to become local when set, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1571 this function causes a local value to exist for this buffer, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1572 just as setting the variable would do. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1573 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1574 This function returns VARIABLE, and therefore |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1575 (set (make-local-variable 'VARIABLE) VALUE-EXP) |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1576 works. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1577 |
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1578 See also `make-variable-buffer-local'. |
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1579 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1580 Do not use `make-local-variable' to make a hook variable buffer-local. |
40628
ae231ad6710d
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40123
diff
changeset
|
1581 Instead, use `add-hook' and specify t for the LOCAL argument. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1582 (register Lisp_Object variable) |
298 | 1583 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1584 register Lisp_Object tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1585 int forwarded; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1586 union Lisp_Val_Fwd valcontents; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1587 struct Lisp_Symbol *sym; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1588 struct Lisp_Buffer_Local_Value *blv = NULL; |
298 | 1589 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1590 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1591 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1592 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1593 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1594 switch (sym->redirect) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1595 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1596 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1597 case SYMBOL_PLAINVAL: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1598 forwarded = 0; valcontents.value = SYMBOL_VAL (sym); break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1599 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1600 blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1601 if (blv->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1602 error ("Symbol %s may not be buffer-local", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1603 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1604 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1605 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1606 forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1607 if (KBOARD_OBJFWDP (valcontents.fwd)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1608 error ("Symbol %s may not be buffer-local", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1609 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1610 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1611 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1612 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1613 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1614 if (sym->constant) |
108005
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1615 error ("Symbol %s may not be buffer-local", |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1616 SDATA (SYMBOL_NAME (variable))); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1617 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1618 if (blv ? blv->local_if_set |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1619 : (forwarded && BUFFER_OBJFWDP (valcontents.fwd))) |
298 | 1620 { |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1621 tem = Fboundp (variable); |
298 | 1622 /* Make sure the symbol has a local value in this particular buffer, |
1623 by setting it to the same value it already has. */ | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1624 Fset (variable, (EQ (tem, Qt) ? Fsymbol_value (variable) : Qunbound)); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1625 return variable; |
298 | 1626 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1627 if (!blv) |
298 | 1628 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1629 blv = make_blv (sym, forwarded, valcontents); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1630 sym->redirect = SYMBOL_LOCALIZED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1631 SET_SYMBOL_BLV (sym, blv); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1632 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1633 Lisp_Object symbol; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1634 XSETSYMBOL (symbol, sym); /* In case `variable' is aliased. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1635 if (let_shadows_global_binding_p (symbol)) |
108005
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1636 message ("Making %s local to %s while let-bound!", |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1637 SDATA (SYMBOL_NAME (variable)), |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1638 SDATA (current_buffer->name)); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1639 } |
298 | 1640 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1641 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1642 /* Make sure this buffer has its own value of symbol. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1643 XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1644 tem = Fassq (variable, current_buffer->local_var_alist); |
490 | 1645 if (NILP (tem)) |
298 | 1646 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1647 if (let_shadows_buffer_binding_p (sym)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1648 message ("Making %s buffer-local while locally let-bound!", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1649 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1650 |
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1651 /* Swap out any local binding for some other buffer, and make |
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1652 sure the current value is permanently recorded, if it's the |
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1653 default value. */ |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1654 find_symbol_value (variable); |
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1655 |
298 | 1656 current_buffer->local_var_alist |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1657 = Fcons (Fcons (variable, XCDR (blv->defcell)), |
298 | 1658 current_buffer->local_var_alist); |
1659 | |
1660 /* Make sure symbol does not think it is set up for this buffer; | |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1661 force it to look once again for this buffer's value. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1662 if (current_buffer == XBUFFER (blv->where)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1663 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1664 /* blv->valcell = blv->defcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1665 * SET_BLV_FOUND (blv, 0); */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1666 blv->found = 0; |
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1667 } |
298 | 1668 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1669 /* If the symbol forwards into a C variable, then load the binding |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1670 for this buffer now. If C code modifies the variable before we |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1671 load the binding in, then that new value will clobber the default |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1672 binding the next time we unload it. */ |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1673 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1674 swap_in_symval_forwarding (sym, blv); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1675 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1676 return variable; |
298 | 1677 } |
1678 | |
1679 DEFUN ("kill-local-variable", Fkill_local_variable, Skill_local_variable, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1680 1, 1, "vKill Local Variable: ", |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1681 doc: /* Make VARIABLE no longer have a separate value in the current buffer. |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
1682 From now on the default value will apply in this buffer. Return VARIABLE. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1683 (register Lisp_Object variable) |
298 | 1684 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1685 register Lisp_Object tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1686 struct Lisp_Buffer_Local_Value *blv; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1687 struct Lisp_Symbol *sym; |
298 | 1688 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1689 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1690 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1691 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1692 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1693 switch (sym->redirect) |
298 | 1694 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1695 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1696 case SYMBOL_PLAINVAL: return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1697 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1698 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1699 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1700 if (BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1701 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1702 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1703 int idx = PER_BUFFER_IDX (offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1704 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1705 if (idx > 0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1706 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1707 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1708 PER_BUFFER_VALUE (current_buffer, offset) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1709 = PER_BUFFER_DEFAULT (offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1710 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1711 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1712 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1713 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1714 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1715 blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1716 if (blv->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1717 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1718 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1719 default: abort (); |
298 | 1720 } |
1721 | |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1722 /* Get rid of this buffer's alist element, if any. */ |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1723 XSETSYMBOL (variable, sym); /* Propagate variable indirection. */ |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1724 tem = Fassq (variable, current_buffer->local_var_alist); |
490 | 1725 if (!NILP (tem)) |
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1726 current_buffer->local_var_alist |
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1727 = Fdelq (tem, current_buffer->local_var_alist); |
298 | 1728 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1729 /* If the symbol is set up with the current buffer's binding |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1730 loaded, recompute its value. We have to do it now, or else |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1731 forwarded objects won't work right. */ |
298 | 1732 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1733 Lisp_Object buf; XSETBUFFER (buf, current_buffer); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1734 if (EQ (buf, blv->where)) |
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1735 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1736 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1737 /* blv->valcell = blv->defcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1738 * SET_BLV_FOUND (blv, 0); */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1739 blv->found = 0; |
14745
f78162b0fc6e
(Fkill_local_variable): Call find_symbol_value directly,
Richard M. Stallman <rms@gnu.org>
parents:
14302
diff
changeset
|
1740 find_symbol_value (variable); |
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1741 } |
298 | 1742 } |
1743 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1744 return variable; |
298 | 1745 } |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1746 |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1747 /* Lisp functions for creating and removing buffer-local variables. */ |
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1748 |
97885 | 1749 /* Obsolete since 22.2. NB adjust doc of modify-frame-parameters |
1750 when/if this is removed. */ | |
1751 | |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1752 DEFUN ("make-variable-frame-local", Fmake_variable_frame_local, Smake_variable_frame_local, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1753 1, 1, "vMake Variable Frame Local: ", |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1754 doc: /* Enable VARIABLE to have frame-local bindings. |
66542
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1755 This does not create any frame-local bindings for VARIABLE, |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1756 it just makes them possible. |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1757 |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1758 A frame-local binding is actually a frame parameter value. |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1759 If a frame F has a value for the frame parameter named VARIABLE, |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1760 that also acts as a frame-local binding for VARIABLE in F-- |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1761 provided this function has been called to enable VARIABLE |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1762 to have frame-local bindings at all. |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1763 |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1764 The only way to create a frame-local binding for VARIABLE in a frame |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1765 is to set the VARIABLE frame parameter of that frame. See |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1766 `modify-frame-parameters' for how to set frame parameters. |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1767 |
97886
8e29e47e574f
(Fmake_variable_frame_local): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97885
diff
changeset
|
1768 Note that since Emacs 23.1, variables cannot be both buffer-local and |
8e29e47e574f
(Fmake_variable_frame_local): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97885
diff
changeset
|
1769 frame-local any more (buffer-local bindings used to take precedence over |
8e29e47e574f
(Fmake_variable_frame_local): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97885
diff
changeset
|
1770 frame-local bindings). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1771 (register Lisp_Object variable) |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1772 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1773 int forwarded; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1774 union Lisp_Val_Fwd valcontents; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1775 struct Lisp_Symbol *sym; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1776 struct Lisp_Buffer_Local_Value *blv = NULL; |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1777 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1778 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1779 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1780 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1781 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1782 switch (sym->redirect) |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1783 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1784 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1785 case SYMBOL_PLAINVAL: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1786 forwarded = 0; valcontents.value = SYMBOL_VAL (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1787 if (EQ (valcontents.value, Qunbound)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1788 valcontents.value = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1789 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1790 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1791 if (SYMBOL_BLV (sym)->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1792 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1793 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1794 error ("Symbol %s may not be frame-local", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1795 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1796 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1797 forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1798 if (KBOARD_OBJFWDP (valcontents.fwd) || BUFFER_OBJFWDP (valcontents.fwd)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1799 error ("Symbol %s may not be frame-local", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1800 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1801 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1802 default: abort (); |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1803 } |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1804 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1805 if (sym->constant) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1806 error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1807 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1808 blv = make_blv (sym, forwarded, valcontents); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1809 blv->frame_local = 1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1810 sym->redirect = SYMBOL_LOCALIZED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1811 SET_SYMBOL_BLV (sym, blv); |
108005
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1812 { |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1813 Lisp_Object symbol; |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1814 XSETSYMBOL (symbol, sym); /* In case `variable' is aliased. */ |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1815 if (let_shadows_global_binding_p (symbol)) |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1816 message ("Making %s frame-local while let-bound!", |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1817 SDATA (SYMBOL_NAME (variable))); |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1818 } |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1819 return variable; |
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1820 } |
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1821 |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1822 DEFUN ("local-variable-p", Flocal_variable_p, Slocal_variable_p, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1823 1, 2, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1824 doc: /* Non-nil if VARIABLE has a local binding in buffer BUFFER. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1825 BUFFER defaults to the current buffer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1826 (register Lisp_Object variable, Lisp_Object buffer) |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1827 { |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1828 register struct buffer *buf; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1829 struct Lisp_Symbol *sym; |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1830 |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1831 if (NILP (buffer)) |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1832 buf = current_buffer; |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1833 else |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1834 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1835 CHECK_BUFFER (buffer); |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1836 buf = XBUFFER (buffer); |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1837 } |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1838 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1839 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1840 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1841 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1842 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1843 switch (sym->redirect) |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1844 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1845 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1846 case SYMBOL_PLAINVAL: return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1847 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1848 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1849 Lisp_Object tail, elt, tmp; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1850 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1851 XSETBUFFER (tmp, buf); |
109621
6ed9d360e4c7
* src/data.c (Flocal_variable_p): Handle variable aliases correctly.
Johan Bockgård <bojohan@gnu.org>
parents:
109573
diff
changeset
|
1852 XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
1853 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1854 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1855 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1856 elt = XCAR (tail); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1857 if (EQ (variable, XCAR (elt))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1858 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1859 eassert (!blv->frame_local); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1860 eassert (BLV_FOUND (blv) || !EQ (blv->where, tmp)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1861 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1862 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1863 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1864 eassert (!BLV_FOUND (blv) || !EQ (blv->where, tmp)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1865 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1866 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1867 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1868 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1869 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1870 if (BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1871 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1872 int offset = XBUFFER_OBJFWD (valcontents)->offset; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1873 int idx = PER_BUFFER_IDX (offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1874 if (idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1875 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1876 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1877 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1878 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1879 default: abort (); |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1880 } |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1881 } |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1882 |
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1883 DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1884 1, 2, 0, |
57618
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1885 doc: /* Non-nil if VARIABLE will be local in buffer BUFFER when set there. |
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1886 More precisely, this means that setting the variable \(with `set' or`setq'), |
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1887 while it does not have a `let'-style binding that was made in BUFFER, |
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1888 will produce a buffer local binding. See Info node |
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1889 `(elisp)Creating Buffer-Local'. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1890 BUFFER defaults to the current buffer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1891 (register Lisp_Object variable, Lisp_Object buffer) |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1892 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1893 struct Lisp_Symbol *sym; |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1894 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1895 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1896 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1897 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1898 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1899 switch (sym->redirect) |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1900 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1901 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1902 case SYMBOL_PLAINVAL: return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1903 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1904 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1905 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1906 if (blv->local_if_set) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1907 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1908 XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1909 return Flocal_variable_p (variable, buffer); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1910 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1911 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1912 /* All BUFFER_OBJFWD slots become local if they are set. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1913 return (BUFFER_OBJFWDP (SYMBOL_FWD (sym)) ? Qt : Qnil); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1914 default: abort (); |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1915 } |
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1916 } |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1917 |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1918 DEFUN ("variable-binding-locus", Fvariable_binding_locus, Svariable_binding_locus, |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1919 1, 1, 0, |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1920 doc: /* Return a value indicating where VARIABLE's current binding comes from. |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1921 If the current binding is buffer-local, the value is the current buffer. |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1922 If the current binding is frame-local, the value is the selected frame. |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1923 If the current binding is global (the default), the value is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1924 (register Lisp_Object variable) |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1925 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1926 struct Lisp_Symbol *sym; |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1927 |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1928 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1929 sym = XSYMBOL (variable); |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1930 |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1931 /* Make sure the current binding is actually swapped in. */ |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1932 find_symbol_value (variable); |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1933 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1934 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1935 switch (sym->redirect) |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1936 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1937 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1938 case SYMBOL_PLAINVAL: return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1939 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1940 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1941 union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1942 if (KBOARD_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1943 return Fframe_terminal (Fselected_frame ()); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1944 else if (!BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1945 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1946 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1947 /* FALLTHROUGH */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1948 case SYMBOL_LOCALIZED: |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1949 /* For a local variable, record both the symbol and which |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1950 buffer's or frame's value we are saving. */ |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1951 if (!NILP (Flocal_variable_p (variable, Qnil))) |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1952 return Fcurrent_buffer (); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1953 else if (sym->redirect == SYMBOL_LOCALIZED |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1954 && BLV_FOUND (SYMBOL_BLV (sym))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1955 return SYMBOL_BLV (sym)->where; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1956 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1957 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1958 default: abort (); |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1959 } |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1960 } |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1961 |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
1962 /* This code is disabled now that we use the selected frame to return |
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
1963 keyboard-local-values. */ |
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
1964 #if 0 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
1965 extern struct terminal *get_terminal (Lisp_Object display, int); |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1966 |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1967 DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0, |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
1968 doc: /* Return the terminal-local value of SYMBOL on TERMINAL. |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1969 If SYMBOL is not a terminal-local variable, then return its normal |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1970 value, like `symbol-value'. |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1971 |
103052
e68707cf48a5
* keyboard.c (Fset_input_meta_mode): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102718
diff
changeset
|
1972 TERMINAL may be a terminal object, a frame, or nil (meaning the |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
1973 selected frame's terminal device). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1974 (Lisp_Object symbol, Lisp_Object terminal) |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1975 { |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1976 Lisp_Object result; |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
1977 struct terminal *t = get_terminal (terminal, 1); |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
1978 push_kboard (t->kboard); |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1979 result = Fsymbol_value (symbol); |
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1980 pop_kboard (); |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1981 return result; |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1982 } |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1983 |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1984 DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_local_value, 3, 3, 0, |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
1985 doc: /* Set the terminal-local binding of SYMBOL on TERMINAL to VALUE. |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1986 If VARIABLE is not a terminal-local variable, then set its normal |
83342
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1987 binding, like `set'. |
9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
1988 |
103052
e68707cf48a5
* keyboard.c (Fset_input_meta_mode): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102718
diff
changeset
|
1989 TERMINAL may be a terminal object, a frame, or nil (meaning the |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
1990 selected frame's terminal device). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1991 (Lisp_Object symbol, Lisp_Object terminal, Lisp_Object value) |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1992 { |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1993 Lisp_Object result; |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83397
diff
changeset
|
1994 struct terminal *t = get_terminal (terminal, 1); |
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1995 push_kboard (d->kboard); |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1996 result = Fset (symbol, value); |
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
1997 pop_kboard (); |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1998 return result; |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1999 } |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
2000 #endif |
298 | 2001 |
648 | 2002 /* Find the function at the end of a chain of symbol function indirections. */ |
2003 | |
2004 /* If OBJECT is a symbol, find the end of its function chain and | |
2005 return the value found there. If OBJECT is not a symbol, just | |
2006 return it. If there is a cycle in the function chain, signal a | |
2007 cyclic-function-indirection error. | |
2008 | |
2009 This is like Findirect_function, except that it doesn't signal an | |
2010 error if the chain ends up unbound. */ | |
2011 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2012 indirect_function (register Lisp_Object object) |
648 | 2013 { |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2014 Lisp_Object tortoise, hare; |
648 | 2015 |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2016 hare = tortoise = object; |
648 | 2017 |
2018 for (;;) | |
2019 { | |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2020 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
648 | 2021 break; |
2022 hare = XSYMBOL (hare)->function; | |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2023 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
648 | 2024 break; |
2025 hare = XSYMBOL (hare)->function; | |
2026 | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2027 tortoise = XSYMBOL (tortoise)->function; |
648 | 2028 |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2029 if (EQ (hare, tortoise)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2030 xsignal1 (Qcyclic_function_indirection, object); |
648 | 2031 } |
2032 | |
2033 return hare; | |
2034 } | |
2035 | |
68758
13c1b7c5f555
* data.c (Findirect_function): Add NOERROR arg. All callers changed
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
2036 DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2037 doc: /* Return the function at the end of OBJECT's function chain. |
68780
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2038 If OBJECT is not a symbol, just return it. Otherwise, follow all |
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2039 function indirections to find the final function binding and return it. |
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2040 If the final symbol in the chain is unbound, signal a void-function error. |
eb6c6d7a4c7f
(Findirect_function): Rewrite docstring.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68758
diff
changeset
|
2041 Optional arg NOERROR non-nil means to return nil instead of signalling. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2042 Signal a cyclic-function-indirection error if there is a loop in the |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2043 function chain of symbols. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2044 (register Lisp_Object object, Lisp_Object noerror) |
648 | 2045 { |
2046 Lisp_Object result; | |
2047 | |
71871
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2048 /* Optimize for no indirection. */ |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2049 result = object; |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2050 if (SYMBOLP (result) && !EQ (result, Qunbound) |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2051 && (result = XSYMBOL (result)->function, SYMBOLP (result))) |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2052 result = indirect_function (result); |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2053 if (!EQ (result, Qunbound)) |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2054 return result; |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2055 |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2056 if (NILP (noerror)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2057 xsignal1 (Qvoid_function, object); |
71871
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2058 |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2059 return Qnil; |
648 | 2060 } |
2061 | |
298 | 2062 /* Extract and set vector and string elements */ |
2063 | |
2064 DEFUN ("aref", Faref, Saref, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2065 doc: /* Return the element of ARRAY at index IDX. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2066 ARRAY may be a vector, a string, a char-table, a bool-vector, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2067 or a byte-code object. IDX starts at 0. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2068 (register Lisp_Object array, Lisp_Object idx) |
298 | 2069 { |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109637
diff
changeset
|
2070 register EMACS_INT idxval; |
298 | 2071 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2072 CHECK_NUMBER (idx); |
298 | 2073 idxval = XINT (idx); |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2074 if (STRINGP (array)) |
298 | 2075 { |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109637
diff
changeset
|
2076 int c; |
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109637
diff
changeset
|
2077 EMACS_INT idxval_byte; |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2078 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2079 if (idxval < 0 || idxval >= SCHARS (array)) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2080 args_out_of_range (array, idx); |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2081 if (! STRING_MULTIBYTE (array)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2082 return make_number ((unsigned char) SREF (array, idxval)); |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2083 idxval_byte = string_char_to_byte (array, idxval); |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2084 |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105885
diff
changeset
|
2085 c = STRING_CHAR (SDATA (array) + idxval_byte); |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2086 return make_number (c); |
298 | 2087 } |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2088 else if (BOOL_VECTOR_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2089 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2090 int val; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2091 |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2092 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2093 args_out_of_range (array, idx); |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2094 |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2095 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2096 return (val & (1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)) ? Qt : Qnil); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2097 } |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2098 else if (CHAR_TABLE_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2099 { |
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2100 CHECK_CHARACTER (idx); |
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2101 return CHAR_TABLE_REF (array, idxval); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2102 } |
298 | 2103 else |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2104 { |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2105 int size = 0; |
10290
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2106 if (VECTORP (array)) |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2107 size = XVECTOR (array)->size; |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2108 else if (COMPILEDP (array)) |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2109 size = XVECTOR (array)->size & PSEUDOVECTOR_SIZE_MASK; |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2110 else |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2111 wrong_type_argument (Qarrayp, array); |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2112 |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2113 if (idxval < 0 || idxval >= size) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2114 args_out_of_range (array, idx); |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2115 return XVECTOR (array)->contents[idxval]; |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2116 } |
298 | 2117 } |
2118 | |
2119 DEFUN ("aset", Faset, Saset, 3, 3, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2120 doc: /* Store into the element of ARRAY at index IDX the value NEWELT. |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
2121 Return NEWELT. ARRAY may be a vector, a string, a char-table or a |
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
2122 bool-vector. IDX starts at 0. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2123 (register Lisp_Object array, Lisp_Object idx, Lisp_Object newelt) |
298 | 2124 { |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109637
diff
changeset
|
2125 register EMACS_INT idxval; |
298 | 2126 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2127 CHECK_NUMBER (idx); |
298 | 2128 idxval = XINT (idx); |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
2129 CHECK_ARRAY (array, Qarrayp); |
298 | 2130 CHECK_IMPURE (array); |
2131 | |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2132 if (VECTORP (array)) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2133 { |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2134 if (idxval < 0 || idxval >= XVECTOR (array)->size) |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2135 args_out_of_range (array, idx); |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2136 XVECTOR (array)->contents[idxval] = newelt; |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2137 } |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2138 else if (BOOL_VECTOR_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2139 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2140 int val; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2141 |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2142 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2143 args_out_of_range (array, idx); |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2144 |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2145 val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2146 |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2147 if (! NILP (newelt)) |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2148 val |= 1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2149 else |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2150 val &= ~(1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)); |
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2151 XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR] = val; |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2152 } |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2153 else if (CHAR_TABLE_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2154 { |
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2155 CHECK_CHARACTER (idx); |
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2156 CHAR_TABLE_SET (array, idxval, newelt); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2157 } |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2158 else if (STRING_MULTIBYTE (array)) |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2159 { |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109637
diff
changeset
|
2160 EMACS_INT idxval_byte, prev_bytes, new_bytes, nbytes; |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2161 unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1; |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2162 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2163 if (idxval < 0 || idxval >= SCHARS (array)) |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2164 args_out_of_range (array, idx); |
89526
58eb89f2fdfc
(Faset): Check newelt by CHECK_CHARACTER. Don't change
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
2165 CHECK_CHARACTER (newelt); |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2166 |
50632
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2167 nbytes = SBYTES (array); |
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2168 |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2169 idxval_byte = string_char_to_byte (array, idxval); |
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2170 p1 = SDATA (array) + idxval_byte; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
2171 prev_bytes = BYTES_BY_CHAR_HEAD (*p1); |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2172 new_bytes = CHAR_STRING (XINT (newelt), p0); |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2173 if (prev_bytes != new_bytes) |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2174 { |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2175 /* We must relocate the string data. */ |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109637
diff
changeset
|
2176 EMACS_INT nchars = SCHARS (array); |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2177 unsigned char *str; |
56193 | 2178 USE_SAFE_ALLOCA; |
2179 | |
2180 SAFE_ALLOCA (str, unsigned char *, nbytes); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
2181 memcpy (str, SDATA (array), nbytes); |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2182 allocate_string_data (XSTRING (array), nchars, |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2183 nbytes + new_bytes - prev_bytes); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
2184 memcpy (SDATA (array), str, idxval_byte); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2185 p1 = SDATA (array) + idxval_byte; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
2186 memcpy (p1 + new_bytes, str + idxval_byte + prev_bytes, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
2187 nbytes - (idxval_byte + prev_bytes)); |
57726
66e97a54985f
Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents:
57618
diff
changeset
|
2188 SAFE_FREE (); |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2189 clear_string_char_byte_cache (); |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2190 } |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2191 while (new_bytes--) |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2192 *p1++ = *p0++; |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2193 } |
298 | 2194 else |
2195 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2196 if (idxval < 0 || idxval >= SCHARS (array)) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2197 args_out_of_range (array, idx); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2198 CHECK_NUMBER (newelt); |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2199 |
90321
344d06a17979
(Faset): On setting a character bigger than 255 in a
Kenichi Handa <handa@m17n.org>
parents:
90295
diff
changeset
|
2200 if (XINT (newelt) >= 0 && ! SINGLE_BYTE_CHAR_P (XINT (newelt))) |
94122
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2201 { |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2202 int i; |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2203 |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2204 for (i = SBYTES (array) - 1; i >= 0; i--) |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2205 if (SREF (array, i) >= 0x80) |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2206 args_out_of_range (array, newelt); |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2207 /* ARRAY is an ASCII string. Convert it to a multibyte |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2208 string, and try `aset' again. */ |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2209 STRING_SET_MULTIBYTE (array); |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2210 return Faset (array, idx, newelt); |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2211 } |
90321
344d06a17979
(Faset): On setting a character bigger than 255 in a
Kenichi Handa <handa@m17n.org>
parents:
90295
diff
changeset
|
2212 SSET (array, idxval, XINT (newelt)); |
298 | 2213 } |
2214 | |
2215 return newelt; | |
2216 } | |
2217 | |
2218 /* Arithmetic functions */ | |
2219 | |
2220 enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal }; | |
2221 | |
2222 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2223 arithcompare (Lisp_Object num1, Lisp_Object num2, enum comparison comparison) |
298 | 2224 { |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2225 double f1 = 0, f2 = 0; |
298 | 2226 int floatp = 0; |
2227 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2228 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2229 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2); |
298 | 2230 |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2231 if (FLOATP (num1) || FLOATP (num2)) |
298 | 2232 { |
2233 floatp = 1; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2234 f1 = (FLOATP (num1)) ? XFLOAT_DATA (num1) : XINT (num1); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2235 f2 = (FLOATP (num2)) ? XFLOAT_DATA (num2) : XINT (num2); |
298 | 2236 } |
2237 | |
2238 switch (comparison) | |
2239 { | |
2240 case equal: | |
2241 if (floatp ? f1 == f2 : XINT (num1) == XINT (num2)) | |
2242 return Qt; | |
2243 return Qnil; | |
2244 | |
2245 case notequal: | |
2246 if (floatp ? f1 != f2 : XINT (num1) != XINT (num2)) | |
2247 return Qt; | |
2248 return Qnil; | |
2249 | |
2250 case less: | |
2251 if (floatp ? f1 < f2 : XINT (num1) < XINT (num2)) | |
2252 return Qt; | |
2253 return Qnil; | |
2254 | |
2255 case less_or_equal: | |
2256 if (floatp ? f1 <= f2 : XINT (num1) <= XINT (num2)) | |
2257 return Qt; | |
2258 return Qnil; | |
2259 | |
2260 case grtr: | |
2261 if (floatp ? f1 > f2 : XINT (num1) > XINT (num2)) | |
2262 return Qt; | |
2263 return Qnil; | |
2264 | |
2265 case grtr_or_equal: | |
2266 if (floatp ? f1 >= f2 : XINT (num1) >= XINT (num2)) | |
2267 return Qt; | |
2268 return Qnil; | |
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2269 |
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2270 default: |
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2271 abort (); |
298 | 2272 } |
2273 } | |
2274 | |
2275 DEFUN ("=", Feqlsign, Seqlsign, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2276 doc: /* Return t if two args, both numbers or markers, are equal. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2277 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2278 { |
2279 return arithcompare (num1, num2, equal); | |
2280 } | |
2281 | |
2282 DEFUN ("<", Flss, Slss, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2283 doc: /* Return t if first arg is less than second arg. Both must be numbers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2284 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2285 { |
2286 return arithcompare (num1, num2, less); | |
2287 } | |
2288 | |
2289 DEFUN (">", Fgtr, Sgtr, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2290 doc: /* Return t if first arg is greater than second arg. Both must be numbers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2291 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2292 { |
2293 return arithcompare (num1, num2, grtr); | |
2294 } | |
2295 | |
2296 DEFUN ("<=", Fleq, Sleq, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2297 doc: /* Return t if first arg is less than or equal to second arg. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2298 Both must be numbers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2299 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2300 { |
2301 return arithcompare (num1, num2, less_or_equal); | |
2302 } | |
2303 | |
2304 DEFUN (">=", Fgeq, Sgeq, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2305 doc: /* Return t if first arg is greater than or equal to second arg. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2306 Both must be numbers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2307 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2308 { |
2309 return arithcompare (num1, num2, grtr_or_equal); | |
2310 } | |
2311 | |
2312 DEFUN ("/=", Fneq, Sneq, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2313 doc: /* Return t if first arg is not equal to second arg. Both must be numbers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2314 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2315 { |
2316 return arithcompare (num1, num2, notequal); | |
2317 } | |
2318 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2319 DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2320 doc: /* Return t if NUMBER is zero. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2321 (register Lisp_Object number) |
298 | 2322 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2323 CHECK_NUMBER_OR_FLOAT (number); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2324 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2325 if (FLOATP (number)) |
298 | 2326 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2327 if (XFLOAT_DATA (number) == 0.0) |
298 | 2328 return Qt; |
2329 return Qnil; | |
2330 } | |
2331 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2332 if (!XINT (number)) |
298 | 2333 return Qt; |
2334 return Qnil; | |
2335 } | |
2336 | |
78140
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2337 /* Convert between long values and pairs of Lisp integers. |
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2338 Note that long_to_cons returns a single Lisp integer |
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2339 when the value fits in one. */ |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2340 |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2341 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2342 long_to_cons (long unsigned int i) |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2343 { |
50109
d23ab2416c49
(long_to_cons): Fix type of top.
Andreas Schwab <schwab@suse.de>
parents:
48996
diff
changeset
|
2344 unsigned long top = i >> 16; |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2345 unsigned int bot = i & 0xFFFF; |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2346 if (top == 0) |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2347 return make_number (bot); |
11879
606889516975
(long_to_cons): Don't assume 32-bit longs.
Karl Heuer <kwzh@gnu.org>
parents:
11734
diff
changeset
|
2348 if (top == (unsigned long)-1 >> 16) |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2349 return Fcons (make_number (-1), make_number (bot)); |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2350 return Fcons (make_number (top), make_number (bot)); |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2351 } |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2352 |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2353 unsigned long |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2354 cons_to_long (Lisp_Object c) |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2355 { |
3675
f42eaf84478f
(cons_to_long): Declare top, bot as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
2356 Lisp_Object top, bot; |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2357 if (INTEGERP (c)) |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2358 return XINT (c); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2359 top = XCAR (c); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2360 bot = XCDR (c); |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2361 if (CONSP (bot)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2362 bot = XCAR (bot); |
2515
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2363 return ((XINT (top) << 16) | XINT (bot)); |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2364 } |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2365 |
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
2366 DEFUN ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0, |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
2367 doc: /* Return the decimal representation of NUMBER as a string. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2368 Uses a minus sign if negative. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2369 NUMBER may be an integer or a floating point number. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2370 (Lisp_Object number) |
298 | 2371 { |
12528
ed5b91dd829a
(Fnumber_to_string): Make `buffer' long enough.
Karl Heuer <kwzh@gnu.org>
parents:
12295
diff
changeset
|
2372 char buffer[VALBITS]; |
298 | 2373 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2374 CHECK_NUMBER_OR_FLOAT (number); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2375 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2376 if (FLOATP (number)) |
298 | 2377 { |
2378 char pigbuf[350]; /* see comments in float_to_string */ | |
2379 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2380 float_to_string (pigbuf, XFLOAT_DATA (number)); |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2381 return build_string (pigbuf); |
298 | 2382 } |
2383 | |
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2384 if (sizeof (int) == sizeof (EMACS_INT)) |
86330
eba0d96e791f
(Fnumber_to_string): Add cast when passing EMACS_INT
Andreas Schwab <schwab@suse.de>
parents:
86285
diff
changeset
|
2385 sprintf (buffer, "%d", (int) XINT (number)); |
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2386 else if (sizeof (long) == sizeof (EMACS_INT)) |
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
2387 sprintf (buffer, "%ld", (long) XINT (number)); |
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2388 else |
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2389 abort (); |
298 | 2390 return build_string (buffer); |
2391 } | |
2392 | |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2393 INLINE static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2394 digit_to_number (int character, int base) |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2395 { |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2396 int digit; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2397 |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2398 if (character >= '0' && character <= '9') |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2399 digit = character - '0'; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2400 else if (character >= 'a' && character <= 'z') |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2401 digit = character - 'a' + 10; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2402 else if (character >= 'A' && character <= 'Z') |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2403 digit = character - 'A' + 10; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2404 else |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2405 return -1; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2406 |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2407 if (digit >= base) |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2408 return -1; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2409 else |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2410 return digit; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
2411 } |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2412 |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2413 DEFUN ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0, |
48996
7931f73b31db
(Fstring_to_number, Fminus): Better English in doc strings.
Francesco Potortì <pot@gnu.org>
parents:
48961
diff
changeset
|
2414 doc: /* Parse STRING as a decimal number and return the number. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2415 This parses both integers and floating point numbers. |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2416 It ignores leading spaces and tabs, and all trailing chars. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2417 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2418 If BASE, interpret STRING as a number in that base. If BASE isn't |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2419 present, base 10 is used. BASE must be between 2 and 16 (inclusive). |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2420 If the base used is not 10, STRING is always parsed as integer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2421 (register Lisp_Object string, Lisp_Object base) |
298 | 2422 { |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2423 register unsigned char *p; |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2424 register int b; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2425 int sign = 1; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2426 Lisp_Object val; |
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2427 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2428 CHECK_STRING (string); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2429 |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2430 if (NILP (base)) |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2431 b = 10; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2432 else |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2433 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2434 CHECK_NUMBER (base); |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2435 b = XINT (base); |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2436 if (b < 2 || b > 16) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2437 xsignal1 (Qargs_out_of_range, base); |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2438 } |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2439 |
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2440 /* Skip any whitespace at the front of the number. Some versions of |
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2441 atoi do this anyway, so we might as well make Emacs lisp consistent. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2442 p = SDATA (string); |
1987
cd893024d6b9
* data.c (Fstring_to_number): Declare p to be an unsigned char, to
Jim Blandy <jimb@redhat.com>
parents:
1914
diff
changeset
|
2443 while (*p == ' ' || *p == '\t') |
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2444 p++; |
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2445 |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2446 if (*p == '-') |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2447 { |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2448 sign = -1; |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2449 p++; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2450 } |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2451 else if (*p == '+') |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2452 p++; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
2453 |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2454 if (isfloat_string (p, 1) && b == 10) |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2455 val = make_float (sign * atof (p)); |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2456 else |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2457 { |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2458 double v = 0; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2459 |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2460 while (1) |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2461 { |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2462 int digit = digit_to_number (*p++, b); |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2463 if (digit < 0) |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2464 break; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2465 v = v * b + digit; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2466 } |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2467 |
39775
280975f8c65e
(Fstring_to_number): Use make_fixnum_or_float.
Gerd Moellmann <gerd@gnu.org>
parents:
39767
diff
changeset
|
2468 val = make_fixnum_or_float (sign * v); |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2469 } |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2470 |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2471 return val; |
298 | 2472 } |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2473 |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2474 |
298 | 2475 enum arithop |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2476 { |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2477 Aadd, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2478 Asub, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2479 Amult, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2480 Adiv, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2481 Alogand, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2482 Alogior, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2483 Alogxor, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2484 Amax, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2485 Amin |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2486 }; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2487 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
2488 static Lisp_Object float_arith_driver (double, int, enum arithop, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108881
diff
changeset
|
2489 int, Lisp_Object *); |
298 | 2490 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2491 arith_driver (enum arithop code, int nargs, register Lisp_Object *args) |
298 | 2492 { |
2493 register Lisp_Object val; | |
2494 register int argnum; | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2495 register EMACS_INT accum = 0; |
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2496 register EMACS_INT next; |
298 | 2497 |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2498 switch (SWITCH_ENUM_CAST (code)) |
298 | 2499 { |
2500 case Alogior: | |
2501 case Alogxor: | |
2502 case Aadd: | |
2503 case Asub: | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2504 accum = 0; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2505 break; |
298 | 2506 case Amult: |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2507 accum = 1; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2508 break; |
298 | 2509 case Alogand: |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2510 accum = -1; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2511 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2512 default: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2513 break; |
298 | 2514 } |
2515 | |
2516 for (argnum = 0; argnum < nargs; argnum++) | |
2517 { | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2518 /* Using args[argnum] as argument to CHECK_NUMBER_... */ |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2519 val = args[argnum]; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2520 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
298 | 2521 |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2522 if (FLOATP (val)) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2523 return float_arith_driver ((double) accum, argnum, code, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2524 nargs, args); |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2525 args[argnum] = val; |
298 | 2526 next = XINT (args[argnum]); |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2527 switch (SWITCH_ENUM_CAST (code)) |
298 | 2528 { |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2529 case Aadd: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2530 accum += next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2531 break; |
298 | 2532 case Asub: |
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2533 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
298 | 2534 break; |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2535 case Amult: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2536 accum *= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2537 break; |
298 | 2538 case Adiv: |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2539 if (!argnum) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2540 accum = next; |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2541 else |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2542 { |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2543 if (next == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2544 xsignal0 (Qarith_error); |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2545 accum /= next; |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2546 } |
298 | 2547 break; |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2548 case Alogand: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2549 accum &= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2550 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2551 case Alogior: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2552 accum |= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2553 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2554 case Alogxor: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2555 accum ^= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2556 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2557 case Amax: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2558 if (!argnum || next > accum) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2559 accum = next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2560 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2561 case Amin: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2562 if (!argnum || next < accum) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2563 accum = next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2564 break; |
298 | 2565 } |
2566 } | |
2567 | |
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2568 XSETINT (val, accum); |
298 | 2569 return val; |
2570 } | |
2571 | |
6201 | 2572 #undef isnan |
2573 #define isnan(x) ((x) != (x)) | |
2574 | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2575 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2576 float_arith_driver (double accum, register int argnum, enum arithop code, int nargs, register Lisp_Object *args) |
298 | 2577 { |
2578 register Lisp_Object val; | |
2579 double next; | |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2580 |
298 | 2581 for (; argnum < nargs; argnum++) |
2582 { | |
2583 val = args[argnum]; /* using args[argnum] as argument to CHECK_NUMBER_... */ | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2584 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
298 | 2585 |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2586 if (FLOATP (val)) |
298 | 2587 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2588 next = XFLOAT_DATA (val); |
298 | 2589 } |
2590 else | |
2591 { | |
2592 args[argnum] = val; /* runs into a compiler bug. */ | |
2593 next = XINT (args[argnum]); | |
2594 } | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2595 switch (SWITCH_ENUM_CAST (code)) |
298 | 2596 { |
2597 case Aadd: | |
2598 accum += next; | |
2599 break; | |
2600 case Asub: | |
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2601 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
298 | 2602 break; |
2603 case Amult: | |
2604 accum *= next; | |
2605 break; | |
2606 case Adiv: | |
2607 if (!argnum) | |
2608 accum = next; | |
2609 else | |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2610 { |
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2611 if (! IEEE_FLOATING_POINT && next == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2612 xsignal0 (Qarith_error); |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2613 accum /= next; |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2614 } |
298 | 2615 break; |
2616 case Alogand: | |
2617 case Alogior: | |
2618 case Alogxor: | |
2619 return wrong_type_argument (Qinteger_or_marker_p, val); | |
2620 case Amax: | |
6201 | 2621 if (!argnum || isnan (next) || next > accum) |
298 | 2622 accum = next; |
2623 break; | |
2624 case Amin: | |
6201 | 2625 if (!argnum || isnan (next) || next < accum) |
298 | 2626 accum = next; |
2627 break; | |
2628 } | |
2629 } | |
2630 | |
2631 return make_float (accum); | |
2632 } | |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
2633 |
298 | 2634 |
2635 DEFUN ("+", Fplus, Splus, 0, MANY, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2636 doc: /* Return sum of any number of arguments, which are numbers or markers. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2637 usage: (+ &rest NUMBERS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2638 (int nargs, Lisp_Object *args) |
298 | 2639 { |
2640 return arith_driver (Aadd, nargs, args); | |
2641 } | |
2642 | |
2643 DEFUN ("-", Fminus, Sminus, 0, MANY, 0, | |
48996
7931f73b31db
(Fstring_to_number, Fminus): Better English in doc strings.
Francesco Potortì <pot@gnu.org>
parents:
48961
diff
changeset
|
2644 doc: /* Negate number or subtract numbers or markers and return the result. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2645 With one arg, negates it. With more than one arg, |
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2646 subtracts all but the first from the first. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2647 usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2648 (int nargs, Lisp_Object *args) |
298 | 2649 { |
2650 return arith_driver (Asub, nargs, args); | |
2651 } | |
2652 | |
2653 DEFUN ("*", Ftimes, Stimes, 0, MANY, 0, | |
41153 | 2654 doc: /* Return product of any number of arguments, which are numbers or markers. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2655 usage: (* &rest NUMBERS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2656 (int nargs, Lisp_Object *args) |
298 | 2657 { |
2658 return arith_driver (Amult, nargs, args); | |
2659 } | |
2660 | |
2661 DEFUN ("/", Fquo, Squo, 2, MANY, 0, | |
41153 | 2662 doc: /* Return first argument divided by all the remaining arguments. |
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2663 The arguments must be numbers or markers. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2664 usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2665 (int nargs, Lisp_Object *args) |
298 | 2666 { |
55440
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2667 int argnum; |
55455 | 2668 for (argnum = 2; argnum < nargs; argnum++) |
55440
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2669 if (FLOATP (args[argnum])) |
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2670 return float_arith_driver (0, 0, Adiv, nargs, args); |
298 | 2671 return arith_driver (Adiv, nargs, args); |
2672 } | |
2673 | |
2674 DEFUN ("%", Frem, Srem, 2, 2, 0, | |
41153 | 2675 doc: /* Return remainder of X divided by Y. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2676 Both must be integers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2677 (register Lisp_Object x, Lisp_Object y) |
298 | 2678 { |
2679 Lisp_Object val; | |
2680 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2681 CHECK_NUMBER_COERCE_MARKER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2682 CHECK_NUMBER_COERCE_MARKER (y); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2683 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2684 if (XFASTINT (y) == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2685 xsignal0 (Qarith_error); |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2686 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2687 XSETINT (val, XINT (x) % XINT (y)); |
298 | 2688 return val; |
2689 } | |
2690 | |
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2691 #ifndef HAVE_FMOD |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2692 double |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2693 fmod (f1, f2) |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2694 double f1, f2; |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2695 { |
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2696 double r = f1; |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2697 |
13296
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2698 if (f2 < 0.0) |
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2699 f2 = -f2; |
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2700 |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2701 /* If the magnitude of the result exceeds that of the divisor, or |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2702 the sign of the result does not agree with that of the dividend, |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2703 iterate with the reduced value. This does not yield a |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2704 particularly accurate result, but at least it will be in the |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2705 range promised by fmod. */ |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2706 do |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2707 r -= f2 * floor (r / f2); |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2708 while (f2 <= (r < 0 ? -r : r) || ((r < 0) != (f1 < 0) && ! isnan (r))); |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2709 |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2710 return r; |
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2711 } |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2712 #endif /* ! HAVE_FMOD */ |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2713 |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2714 DEFUN ("mod", Fmod, Smod, 2, 2, 0, |
41153 | 2715 doc: /* Return X modulo Y. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2716 The result falls between zero (inclusive) and Y (exclusive). |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2717 Both X and Y must be numbers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2718 (register Lisp_Object x, Lisp_Object y) |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2719 { |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2720 Lisp_Object val; |
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2721 EMACS_INT i1, i2; |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2722 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2723 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2724 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (y); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2725 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2726 if (FLOATP (x) || FLOATP (y)) |
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2727 return fmod_float (x, y); |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2728 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2729 i1 = XINT (x); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2730 i2 = XINT (y); |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2731 |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2732 if (i2 == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2733 xsignal0 (Qarith_error); |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2734 |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2735 i1 %= i2; |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2736 |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2737 /* If the "remainder" comes out with the wrong sign, fix it. */ |
11155
0aede77c1593
(Fmod): Fix the final adjustment, when i2 < 0 and i1 == 0.
Richard M. Stallman <rms@gnu.org>
parents:
11019
diff
changeset
|
2738 if (i2 < 0 ? i1 > 0 : i1 < 0) |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2739 i1 += i2; |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2740 |
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2741 XSETINT (val, i1); |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2742 return val; |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2743 } |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2744 |
298 | 2745 DEFUN ("max", Fmax, Smax, 1, MANY, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2746 doc: /* Return largest of all the arguments (which must be numbers or markers). |
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2747 The value is always a number; markers are converted to numbers. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2748 usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2749 (int nargs, Lisp_Object *args) |
298 | 2750 { |
2751 return arith_driver (Amax, nargs, args); | |
2752 } | |
2753 | |
2754 DEFUN ("min", Fmin, Smin, 1, MANY, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2755 doc: /* Return smallest of all the arguments (which must be numbers or markers). |
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2756 The value is always a number; markers are converted to numbers. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2757 usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2758 (int nargs, Lisp_Object *args) |
298 | 2759 { |
2760 return arith_driver (Amin, nargs, args); | |
2761 } | |
2762 | |
2763 DEFUN ("logand", Flogand, Slogand, 0, MANY, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2764 doc: /* Return bitwise-and of all the arguments. |
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2765 Arguments may be integers, or markers converted to integers. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2766 usage: (logand &rest INTS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2767 (int nargs, Lisp_Object *args) |
298 | 2768 { |
2769 return arith_driver (Alogand, nargs, args); | |
2770 } | |
2771 | |
2772 DEFUN ("logior", Flogior, Slogior, 0, MANY, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2773 doc: /* Return bitwise-or of all the arguments. |
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2774 Arguments may be integers, or markers converted to integers. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2775 usage: (logior &rest INTS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2776 (int nargs, Lisp_Object *args) |
298 | 2777 { |
2778 return arith_driver (Alogior, nargs, args); | |
2779 } | |
2780 | |
2781 DEFUN ("logxor", Flogxor, Slogxor, 0, MANY, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2782 doc: /* Return bitwise-exclusive-or of all the arguments. |
40116
528dd5f565ba
(Fplus, Fminus, Fmax, Ftimes, Fquo, Flogand, Flogior, Flogxor):
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2783 Arguments may be integers, or markers converted to integers. |
73925
a248fe2d281f
(Flogxor): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
73838
diff
changeset
|
2784 usage: (logxor &rest INTS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2785 (int nargs, Lisp_Object *args) |
298 | 2786 { |
2787 return arith_driver (Alogxor, nargs, args); | |
2788 } | |
2789 | |
2790 DEFUN ("ash", Fash, Sash, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2791 doc: /* Return VALUE with its bits shifted left by COUNT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2792 If COUNT is negative, shifting is actually to the right. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2793 In this case, the sign bit is duplicated. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2794 (register Lisp_Object value, Lisp_Object count) |
298 | 2795 { |
2796 register Lisp_Object val; | |
2797 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2798 CHECK_NUMBER (value); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2799 CHECK_NUMBER (count); |
298 | 2800 |
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2801 if (XINT (count) >= BITS_PER_EMACS_INT) |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2802 XSETINT (val, 0); |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2803 else if (XINT (count) > 0) |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2804 XSETINT (val, XINT (value) << XFASTINT (count)); |
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2805 else if (XINT (count) <= -BITS_PER_EMACS_INT) |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2806 XSETINT (val, XINT (value) < 0 ? -1 : 0); |
298 | 2807 else |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2808 XSETINT (val, XINT (value) >> -XINT (count)); |
298 | 2809 return val; |
2810 } | |
2811 | |
2812 DEFUN ("lsh", Flsh, Slsh, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2813 doc: /* Return VALUE with its bits shifted left by COUNT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2814 If COUNT is negative, shifting is actually to the right. |
47276
fbe02a367006
(Flsh): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
46831
diff
changeset
|
2815 In this case, zeros are shifted in on the left. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2816 (register Lisp_Object value, Lisp_Object count) |
298 | 2817 { |
2818 register Lisp_Object val; | |
2819 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2820 CHECK_NUMBER (value); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2821 CHECK_NUMBER (count); |
298 | 2822 |
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2823 if (XINT (count) >= BITS_PER_EMACS_INT) |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2824 XSETINT (val, 0); |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2825 else if (XINT (count) > 0) |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2826 XSETINT (val, (EMACS_UINT) XUINT (value) << XFASTINT (count)); |
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2827 else if (XINT (count) <= -BITS_PER_EMACS_INT) |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2828 XSETINT (val, 0); |
298 | 2829 else |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2830 XSETINT (val, (EMACS_UINT) XUINT (value) >> -XINT (count)); |
298 | 2831 return val; |
2832 } | |
2833 | |
2834 DEFUN ("1+", Fadd1, Sadd1, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2835 doc: /* Return NUMBER plus one. NUMBER may be a number or a marker. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2836 Markers are converted to integers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2837 (register Lisp_Object number) |
298 | 2838 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2839 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2840 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2841 if (FLOATP (number)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2842 return (make_float (1.0 + XFLOAT_DATA (number))); |
298 | 2843 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2844 XSETINT (number, XINT (number) + 1); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2845 return number; |
298 | 2846 } |
2847 | |
2848 DEFUN ("1-", Fsub1, Ssub1, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2849 doc: /* Return NUMBER minus one. NUMBER may be a number or a marker. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2850 Markers are converted to integers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2851 (register Lisp_Object number) |
298 | 2852 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2853 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2854 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2855 if (FLOATP (number)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2856 return (make_float (-1.0 + XFLOAT_DATA (number))); |
298 | 2857 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2858 XSETINT (number, XINT (number) - 1); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2859 return number; |
298 | 2860 } |
2861 | |
2862 DEFUN ("lognot", Flognot, Slognot, 1, 1, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2863 doc: /* Return the bitwise complement of NUMBER. NUMBER must be an integer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2864 (register Lisp_Object number) |
298 | 2865 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2866 CHECK_NUMBER (number); |
14096
f3766d691555
(Flognot): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14066
diff
changeset
|
2867 XSETINT (number, ~XINT (number)); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2868 return number; |
298 | 2869 } |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2870 |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2871 DEFUN ("byteorder", Fbyteorder, Sbyteorder, 0, 0, 0, |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2872 doc: /* Return the byteorder for the machine. |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2873 Returns 66 (ASCII uppercase B) for big endian machines or 108 (ASCII |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2874 lowercase l) for small endian machines. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2875 (void) |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2876 { |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2877 unsigned i = 0x04030201; |
54660
122a60d4f165
data.c (Fbyteorder): Make test work even if unsigned is not 4 bytes.
Jan Djärv <jan.h.d@swipnet.se>
parents:
54627
diff
changeset
|
2878 int order = *(char *)&i == 1 ? 108 : 66; |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2879 |
53966
26dc8943ee64
Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53910
diff
changeset
|
2880 return make_number (order); |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2881 } |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2882 |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2883 |
298 | 2884 |
2885 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2886 syms_of_data (void) |
298 | 2887 { |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2888 Lisp_Object error_tail, arith_tail; |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2889 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2890 Qquote = intern_c_string ("quote"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2891 Qlambda = intern_c_string ("lambda"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2892 Qsubr = intern_c_string ("subr"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2893 Qerror_conditions = intern_c_string ("error-conditions"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2894 Qerror_message = intern_c_string ("error-message"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2895 Qtop_level = intern_c_string ("top-level"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2896 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2897 Qerror = intern_c_string ("error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2898 Qquit = intern_c_string ("quit"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2899 Qwrong_type_argument = intern_c_string ("wrong-type-argument"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2900 Qargs_out_of_range = intern_c_string ("args-out-of-range"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2901 Qvoid_function = intern_c_string ("void-function"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2902 Qcyclic_function_indirection = intern_c_string ("cyclic-function-indirection"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2903 Qcyclic_variable_indirection = intern_c_string ("cyclic-variable-indirection"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2904 Qvoid_variable = intern_c_string ("void-variable"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2905 Qsetting_constant = intern_c_string ("setting-constant"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2906 Qinvalid_read_syntax = intern_c_string ("invalid-read-syntax"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2907 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2908 Qinvalid_function = intern_c_string ("invalid-function"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2909 Qwrong_number_of_arguments = intern_c_string ("wrong-number-of-arguments"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2910 Qno_catch = intern_c_string ("no-catch"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2911 Qend_of_file = intern_c_string ("end-of-file"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2912 Qarith_error = intern_c_string ("arith-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2913 Qbeginning_of_buffer = intern_c_string ("beginning-of-buffer"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2914 Qend_of_buffer = intern_c_string ("end-of-buffer"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2915 Qbuffer_read_only = intern_c_string ("buffer-read-only"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2916 Qtext_read_only = intern_c_string ("text-read-only"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2917 Qmark_inactive = intern_c_string ("mark-inactive"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2918 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2919 Qlistp = intern_c_string ("listp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2920 Qconsp = intern_c_string ("consp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2921 Qsymbolp = intern_c_string ("symbolp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2922 Qkeywordp = intern_c_string ("keywordp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2923 Qintegerp = intern_c_string ("integerp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2924 Qnatnump = intern_c_string ("natnump"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2925 Qwholenump = intern_c_string ("wholenump"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2926 Qstringp = intern_c_string ("stringp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2927 Qarrayp = intern_c_string ("arrayp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2928 Qsequencep = intern_c_string ("sequencep"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2929 Qbufferp = intern_c_string ("bufferp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2930 Qvectorp = intern_c_string ("vectorp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2931 Qchar_or_string_p = intern_c_string ("char-or-string-p"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2932 Qmarkerp = intern_c_string ("markerp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2933 Qbuffer_or_string_p = intern_c_string ("buffer-or-string-p"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2934 Qinteger_or_marker_p = intern_c_string ("integer-or-marker-p"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2935 Qboundp = intern_c_string ("boundp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2936 Qfboundp = intern_c_string ("fboundp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2937 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2938 Qfloatp = intern_c_string ("floatp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2939 Qnumberp = intern_c_string ("numberp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2940 Qnumber_or_marker_p = intern_c_string ("number-or-marker-p"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2941 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2942 Qchar_table_p = intern_c_string ("char-table-p"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2943 Qvector_or_char_table_p = intern_c_string ("vector-or-char-table-p"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2944 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2945 Qsubrp = intern_c_string ("subrp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2946 Qunevalled = intern_c_string ("unevalled"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2947 Qmany = intern_c_string ("many"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2948 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2949 Qcdr = intern_c_string ("cdr"); |
298 | 2950 |
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2951 /* Handle automatic advice activation */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2952 Qad_advice_info = intern_c_string ("ad-advice-info"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2953 Qad_activate_internal = intern_c_string ("ad-activate-internal"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2954 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2955 error_tail = pure_cons (Qerror, Qnil); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2956 |
298 | 2957 /* ERROR is used as a signaler for random errors for which nothing else is right */ |
2958 | |
2959 Fput (Qerror, Qerror_conditions, | |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2960 error_tail); |
298 | 2961 Fput (Qerror, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2962 make_pure_c_string ("error")); |
298 | 2963 |
2964 Fput (Qquit, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2965 pure_cons (Qquit, Qnil)); |
298 | 2966 Fput (Qquit, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2967 make_pure_c_string ("Quit")); |
298 | 2968 |
2969 Fput (Qwrong_type_argument, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2970 pure_cons (Qwrong_type_argument, error_tail)); |
298 | 2971 Fput (Qwrong_type_argument, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2972 make_pure_c_string ("Wrong type argument")); |
298 | 2973 |
2974 Fput (Qargs_out_of_range, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2975 pure_cons (Qargs_out_of_range, error_tail)); |
298 | 2976 Fput (Qargs_out_of_range, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2977 make_pure_c_string ("Args out of range")); |
298 | 2978 |
2979 Fput (Qvoid_function, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2980 pure_cons (Qvoid_function, error_tail)); |
298 | 2981 Fput (Qvoid_function, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2982 make_pure_c_string ("Symbol's function definition is void")); |
298 | 2983 |
648 | 2984 Fput (Qcyclic_function_indirection, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2985 pure_cons (Qcyclic_function_indirection, error_tail)); |
648 | 2986 Fput (Qcyclic_function_indirection, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2987 make_pure_c_string ("Symbol's chain of function indirections contains a loop")); |
648 | 2988 |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2989 Fput (Qcyclic_variable_indirection, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2990 pure_cons (Qcyclic_variable_indirection, error_tail)); |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
2991 Fput (Qcyclic_variable_indirection, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2992 make_pure_c_string ("Symbol's chain of variable indirections contains a loop")); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2993 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2994 Qcircular_list = intern_c_string ("circular-list"); |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2995 staticpro (&Qcircular_list); |
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2996 Fput (Qcircular_list, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2997 pure_cons (Qcircular_list, error_tail)); |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
2998 Fput (Qcircular_list, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2999 make_pure_c_string ("List contains a loop")); |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3000 |
298 | 3001 Fput (Qvoid_variable, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3002 pure_cons (Qvoid_variable, error_tail)); |
298 | 3003 Fput (Qvoid_variable, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3004 make_pure_c_string ("Symbol's value as variable is void")); |
298 | 3005 |
3006 Fput (Qsetting_constant, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3007 pure_cons (Qsetting_constant, error_tail)); |
298 | 3008 Fput (Qsetting_constant, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3009 make_pure_c_string ("Attempt to set a constant symbol")); |
298 | 3010 |
3011 Fput (Qinvalid_read_syntax, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3012 pure_cons (Qinvalid_read_syntax, error_tail)); |
298 | 3013 Fput (Qinvalid_read_syntax, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3014 make_pure_c_string ("Invalid read syntax")); |
298 | 3015 |
3016 Fput (Qinvalid_function, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3017 pure_cons (Qinvalid_function, error_tail)); |
298 | 3018 Fput (Qinvalid_function, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3019 make_pure_c_string ("Invalid function")); |
298 | 3020 |
3021 Fput (Qwrong_number_of_arguments, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3022 pure_cons (Qwrong_number_of_arguments, error_tail)); |
298 | 3023 Fput (Qwrong_number_of_arguments, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3024 make_pure_c_string ("Wrong number of arguments")); |
298 | 3025 |
3026 Fput (Qno_catch, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3027 pure_cons (Qno_catch, error_tail)); |
298 | 3028 Fput (Qno_catch, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3029 make_pure_c_string ("No catch for tag")); |
298 | 3030 |
3031 Fput (Qend_of_file, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3032 pure_cons (Qend_of_file, error_tail)); |
298 | 3033 Fput (Qend_of_file, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3034 make_pure_c_string ("End of file during parsing")); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3035 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3036 arith_tail = pure_cons (Qarith_error, error_tail); |
298 | 3037 Fput (Qarith_error, Qerror_conditions, |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3038 arith_tail); |
298 | 3039 Fput (Qarith_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3040 make_pure_c_string ("Arithmetic error")); |
298 | 3041 |
3042 Fput (Qbeginning_of_buffer, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3043 pure_cons (Qbeginning_of_buffer, error_tail)); |
298 | 3044 Fput (Qbeginning_of_buffer, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3045 make_pure_c_string ("Beginning of buffer")); |
298 | 3046 |
3047 Fput (Qend_of_buffer, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3048 pure_cons (Qend_of_buffer, error_tail)); |
298 | 3049 Fput (Qend_of_buffer, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3050 make_pure_c_string ("End of buffer")); |
298 | 3051 |
3052 Fput (Qbuffer_read_only, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3053 pure_cons (Qbuffer_read_only, error_tail)); |
298 | 3054 Fput (Qbuffer_read_only, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3055 make_pure_c_string ("Buffer is read-only")); |
298 | 3056 |
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3057 Fput (Qtext_read_only, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3058 pure_cons (Qtext_read_only, error_tail)); |
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3059 Fput (Qtext_read_only, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3060 make_pure_c_string ("Text is read-only")); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3061 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3062 Qrange_error = intern_c_string ("range-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3063 Qdomain_error = intern_c_string ("domain-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3064 Qsingularity_error = intern_c_string ("singularity-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3065 Qoverflow_error = intern_c_string ("overflow-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3066 Qunderflow_error = intern_c_string ("underflow-error"); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3067 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3068 Fput (Qdomain_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3069 pure_cons (Qdomain_error, arith_tail)); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3070 Fput (Qdomain_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3071 make_pure_c_string ("Arithmetic domain error")); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3072 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3073 Fput (Qrange_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3074 pure_cons (Qrange_error, arith_tail)); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3075 Fput (Qrange_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3076 make_pure_c_string ("Arithmetic range error")); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3077 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3078 Fput (Qsingularity_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3079 pure_cons (Qsingularity_error, Fcons (Qdomain_error, arith_tail))); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3080 Fput (Qsingularity_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3081 make_pure_c_string ("Arithmetic singularity error")); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3082 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3083 Fput (Qoverflow_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3084 pure_cons (Qoverflow_error, Fcons (Qdomain_error, arith_tail))); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3085 Fput (Qoverflow_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3086 make_pure_c_string ("Arithmetic overflow error")); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3087 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3088 Fput (Qunderflow_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3089 pure_cons (Qunderflow_error, Fcons (Qdomain_error, arith_tail))); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3090 Fput (Qunderflow_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3091 make_pure_c_string ("Arithmetic underflow error")); |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3092 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3093 staticpro (&Qrange_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3094 staticpro (&Qdomain_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3095 staticpro (&Qsingularity_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3096 staticpro (&Qoverflow_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3097 staticpro (&Qunderflow_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3098 |
298 | 3099 staticpro (&Qnil); |
3100 staticpro (&Qt); | |
3101 staticpro (&Qquote); | |
3102 staticpro (&Qlambda); | |
3103 staticpro (&Qsubr); | |
3104 staticpro (&Qunbound); | |
3105 staticpro (&Qerror_conditions); | |
3106 staticpro (&Qerror_message); | |
3107 staticpro (&Qtop_level); | |
3108 | |
3109 staticpro (&Qerror); | |
3110 staticpro (&Qquit); | |
3111 staticpro (&Qwrong_type_argument); | |
3112 staticpro (&Qargs_out_of_range); | |
3113 staticpro (&Qvoid_function); | |
648 | 3114 staticpro (&Qcyclic_function_indirection); |
61888
a0e6e458f2fc
(syms_of_data) Staticpro Qcyclic_variable_indirection.
Kim F. Storm <storm@cua.dk>
parents:
61686
diff
changeset
|
3115 staticpro (&Qcyclic_variable_indirection); |
298 | 3116 staticpro (&Qvoid_variable); |
3117 staticpro (&Qsetting_constant); | |
3118 staticpro (&Qinvalid_read_syntax); | |
3119 staticpro (&Qwrong_number_of_arguments); | |
3120 staticpro (&Qinvalid_function); | |
3121 staticpro (&Qno_catch); | |
3122 staticpro (&Qend_of_file); | |
3123 staticpro (&Qarith_error); | |
3124 staticpro (&Qbeginning_of_buffer); | |
3125 staticpro (&Qend_of_buffer); | |
3126 staticpro (&Qbuffer_read_only); | |
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3127 staticpro (&Qtext_read_only); |
4037
aecb99c65ab0
(syms_of_data): Staticpro Qmark_inactive.
Roland McGrath <roland@gnu.org>
parents:
4036
diff
changeset
|
3128 staticpro (&Qmark_inactive); |
298 | 3129 |
3130 staticpro (&Qlistp); | |
3131 staticpro (&Qconsp); | |
3132 staticpro (&Qsymbolp); | |
26931 | 3133 staticpro (&Qkeywordp); |
298 | 3134 staticpro (&Qintegerp); |
3135 staticpro (&Qnatnump); | |
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3136 staticpro (&Qwholenump); |
298 | 3137 staticpro (&Qstringp); |
3138 staticpro (&Qarrayp); | |
3139 staticpro (&Qsequencep); | |
3140 staticpro (&Qbufferp); | |
3141 staticpro (&Qvectorp); | |
3142 staticpro (&Qchar_or_string_p); | |
3143 staticpro (&Qmarkerp); | |
1293 | 3144 staticpro (&Qbuffer_or_string_p); |
298 | 3145 staticpro (&Qinteger_or_marker_p); |
3146 staticpro (&Qfloatp); | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3147 staticpro (&Qnumberp); |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3148 staticpro (&Qnumber_or_marker_p); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3149 staticpro (&Qchar_table_p); |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3150 staticpro (&Qvector_or_char_table_p); |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3151 staticpro (&Qsubrp); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3152 staticpro (&Qmany); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3153 staticpro (&Qunevalled); |
298 | 3154 |
3155 staticpro (&Qboundp); | |
3156 staticpro (&Qfboundp); | |
3157 staticpro (&Qcdr); | |
8448
b6335ce87e16
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
Richard M. Stallman <rms@gnu.org>
parents:
8415
diff
changeset
|
3158 staticpro (&Qad_advice_info); |
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
3159 staticpro (&Qad_activate_internal); |
298 | 3160 |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3161 /* Types that type-of returns. */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3162 Qinteger = intern_c_string ("integer"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3163 Qsymbol = intern_c_string ("symbol"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3164 Qstring = intern_c_string ("string"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3165 Qcons = intern_c_string ("cons"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3166 Qmarker = intern_c_string ("marker"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3167 Qoverlay = intern_c_string ("overlay"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3168 Qfloat = intern_c_string ("float"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3169 Qwindow_configuration = intern_c_string ("window-configuration"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3170 Qprocess = intern_c_string ("process"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3171 Qwindow = intern_c_string ("window"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3172 /* Qsubr = intern_c_string ("subr"); */ |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3173 Qcompiled_function = intern_c_string ("compiled-function"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3174 Qbuffer = intern_c_string ("buffer"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3175 Qframe = intern_c_string ("frame"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3176 Qvector = intern_c_string ("vector"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3177 Qchar_table = intern_c_string ("char-table"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3178 Qbool_vector = intern_c_string ("bool-vector"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3179 Qhash_table = intern_c_string ("hash-table"); |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3180 |
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3181 DEFSYM (Qfont_spec, "font-spec"); |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3182 DEFSYM (Qfont_entity, "font-entity"); |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3183 DEFSYM (Qfont_object, "font-object"); |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3184 |
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
3185 DEFSYM (Qinteractive_form, "interactive-form"); |
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
3186 |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3187 staticpro (&Qinteger); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3188 staticpro (&Qsymbol); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3189 staticpro (&Qstring); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3190 staticpro (&Qcons); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3191 staticpro (&Qmarker); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3192 staticpro (&Qoverlay); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3193 staticpro (&Qfloat); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3194 staticpro (&Qwindow_configuration); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3195 staticpro (&Qprocess); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3196 staticpro (&Qwindow); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3197 /* staticpro (&Qsubr); */ |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3198 staticpro (&Qcompiled_function); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3199 staticpro (&Qbuffer); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3200 staticpro (&Qframe); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3201 staticpro (&Qvector); |
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3202 staticpro (&Qchar_table); |
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3203 staticpro (&Qbool_vector); |
26185 | 3204 staticpro (&Qhash_table); |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3205 |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3206 defsubr (&Sindirect_variable); |
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
3207 defsubr (&Sinteractive_form); |
298 | 3208 defsubr (&Seq); |
3209 defsubr (&Snull); | |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3210 defsubr (&Stype_of); |
298 | 3211 defsubr (&Slistp); |
3212 defsubr (&Snlistp); | |
3213 defsubr (&Sconsp); | |
3214 defsubr (&Satom); | |
3215 defsubr (&Sintegerp); | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3216 defsubr (&Sinteger_or_marker_p); |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3217 defsubr (&Snumberp); |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3218 defsubr (&Snumber_or_marker_p); |
298 | 3219 defsubr (&Sfloatp); |
3220 defsubr (&Snatnump); | |
3221 defsubr (&Ssymbolp); | |
26931 | 3222 defsubr (&Skeywordp); |
298 | 3223 defsubr (&Sstringp); |
20793
b2af60896559
(syms_of_data): Register multibyte-string-p as a Lisp
Kenichi Handa <handa@m17n.org>
parents:
20716
diff
changeset
|
3224 defsubr (&Smultibyte_string_p); |
298 | 3225 defsubr (&Svectorp); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3226 defsubr (&Schar_table_p); |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3227 defsubr (&Svector_or_char_table_p); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3228 defsubr (&Sbool_vector_p); |
298 | 3229 defsubr (&Sarrayp); |
3230 defsubr (&Ssequencep); | |
3231 defsubr (&Sbufferp); | |
3232 defsubr (&Smarkerp); | |
3233 defsubr (&Ssubrp); | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
3234 defsubr (&Sbyte_code_function_p); |
298 | 3235 defsubr (&Schar_or_string_p); |
3236 defsubr (&Scar); | |
3237 defsubr (&Scdr); | |
3238 defsubr (&Scar_safe); | |
3239 defsubr (&Scdr_safe); | |
3240 defsubr (&Ssetcar); | |
3241 defsubr (&Ssetcdr); | |
3242 defsubr (&Ssymbol_function); | |
648 | 3243 defsubr (&Sindirect_function); |
298 | 3244 defsubr (&Ssymbol_plist); |
3245 defsubr (&Ssymbol_name); | |
3246 defsubr (&Smakunbound); | |
3247 defsubr (&Sfmakunbound); | |
3248 defsubr (&Sboundp); | |
3249 defsubr (&Sfboundp); | |
3250 defsubr (&Sfset); | |
2565
c1a1557bffde
(Fdefine_function): Changed name back to Fdefalias, so we get things
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2548
diff
changeset
|
3251 defsubr (&Sdefalias); |
298 | 3252 defsubr (&Ssetplist); |
3253 defsubr (&Ssymbol_value); | |
3254 defsubr (&Sset); | |
3255 defsubr (&Sdefault_boundp); | |
3256 defsubr (&Sdefault_value); | |
3257 defsubr (&Sset_default); | |
3258 defsubr (&Ssetq_default); | |
3259 defsubr (&Smake_variable_buffer_local); | |
3260 defsubr (&Smake_local_variable); | |
3261 defsubr (&Skill_local_variable); | |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
3262 defsubr (&Smake_variable_frame_local); |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
3263 defsubr (&Slocal_variable_p); |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
3264 defsubr (&Slocal_variable_if_set_p); |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
3265 defsubr (&Svariable_binding_locus); |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
3266 #if 0 /* XXX Remove this. --lorentey */ |
83325
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
3267 defsubr (&Sterminal_local_value); |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
3268 defsubr (&Sset_terminal_local_value); |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
3269 #endif |
298 | 3270 defsubr (&Saref); |
3271 defsubr (&Saset); | |
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
3272 defsubr (&Snumber_to_string); |
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
3273 defsubr (&Sstring_to_number); |
298 | 3274 defsubr (&Seqlsign); |
3275 defsubr (&Slss); | |
3276 defsubr (&Sgtr); | |
3277 defsubr (&Sleq); | |
3278 defsubr (&Sgeq); | |
3279 defsubr (&Sneq); | |
3280 defsubr (&Szerop); | |
3281 defsubr (&Splus); | |
3282 defsubr (&Sminus); | |
3283 defsubr (&Stimes); | |
3284 defsubr (&Squo); | |
3285 defsubr (&Srem); | |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
3286 defsubr (&Smod); |
298 | 3287 defsubr (&Smax); |
3288 defsubr (&Smin); | |
3289 defsubr (&Slogand); | |
3290 defsubr (&Slogior); | |
3291 defsubr (&Slogxor); | |
3292 defsubr (&Slsh); | |
3293 defsubr (&Sash); | |
3294 defsubr (&Sadd1); | |
3295 defsubr (&Ssub1); | |
3296 defsubr (&Slognot); | |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3297 defsubr (&Sbyteorder); |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3298 defsubr (&Ssubr_arity); |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
3299 defsubr (&Ssubr_name); |
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3300 |
9954
18b408b05189
(syms_of_data): Set Qwholenump as function, not variable.
Karl Heuer <kwzh@gnu.org>
parents:
9895
diff
changeset
|
3301 XSYMBOL (Qwholenump)->function = XSYMBOL (Qnatnump)->function; |
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
37853
diff
changeset
|
3302 |
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3303 DEFVAR_LISP ("most-positive-fixnum", &Vmost_positive_fixnum, |
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3304 doc: /* The largest value that is representable in a Lisp integer. */); |
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3305 Vmost_positive_fixnum = make_number (MOST_POSITIVE_FIXNUM); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3306 XSYMBOL (intern_c_string ("most-positive-fixnum"))->constant = 1; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
3307 |
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3308 DEFVAR_LISP ("most-negative-fixnum", &Vmost_negative_fixnum, |
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3309 doc: /* The smallest value that is representable in a Lisp integer. */); |
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3310 Vmost_negative_fixnum = make_number (MOST_NEGATIVE_FIXNUM); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3311 XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1; |
298 | 3312 } |
3313 | |
490 | 3314 SIGTYPE |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3315 arith_error (int signo) |
298 | 3316 { |
638 | 3317 sigsetmask (SIGEMPTYMASK); |
298 | 3318 |
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58733
diff
changeset
|
3319 SIGNAL_THREAD_CHECK (signo); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
3320 xsignal0 (Qarith_error); |
298 | 3321 } |
3322 | |
21514 | 3323 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3324 init_data (void) |
298 | 3325 { |
3326 /* Don't do this if just dumping out. | |
3327 We don't want to call `signal' in this case | |
3328 so that we don't have trouble with dumping | |
3329 signal-delivering routines in an inconsistent state. */ | |
3330 #ifndef CANNOT_DUMP | |
3331 if (!initialized) | |
3332 return; | |
3333 #endif /* CANNOT_DUMP */ | |
3334 signal (SIGFPE, arith_error); | |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
3335 |
298 | 3336 #ifdef uts |
3337 signal (SIGEMT, arith_error); | |
3338 #endif /* uts */ | |
3339 } | |
52401 | 3340 |
3341 /* arch-tag: 25879798-b84d-479a-9c89-7d148e2109f7 | |
3342 (do not change this comment) */ |