Mercurial > emacs
annotate src/data.c @ 111306:d86b7e0aed88
Reposition some aliases in holidays.el.
* lisp/calendar/holidays.el (general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays, christian-holidays)
(islamic-holidays, bahai-holidays, solar-holidays): Move aliases before
the definitions of their targets.
(The position doesn't actually matter so long as the aliases are autoloaded).
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 01 Nov 2010 00:40:11 -0700 |
parents | 66f6be9b4d43 |
children | 317ffffec7f3 |
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 /* On some machines, XINT needs a temporary location. | |
139 Here it is, in case it is needed. */ | |
140 | |
141 int sign_extend_temp; | |
142 | |
143 /* On a few machines, XINT can only be done by calling this. */ | |
144 | |
145 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
146 sign_extend_lisp_int (EMACS_INT num) |
298 | 147 { |
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
148 if (num & (((EMACS_INT) 1) << (VALBITS - 1))) |
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
149 return num | (((EMACS_INT) (-1)) << VALBITS); |
298 | 150 else |
8820
f68749766ed1
(sign_extend_lisp_int): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8798
diff
changeset
|
151 return num & ((((EMACS_INT) 1) << VALBITS) - 1); |
298 | 152 } |
153 | |
154 /* Data type predicates */ | |
155 | |
156 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
|
157 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
|
158 (Lisp_Object obj1, Lisp_Object obj2) |
298 | 159 { |
160 if (EQ (obj1, obj2)) | |
161 return Qt; | |
162 return Qnil; | |
163 } | |
164 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
165 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
|
166 doc: /* Return t if OBJECT is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
167 (Lisp_Object object) |
298 | 168 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
169 if (NILP (object)) |
298 | 170 return Qt; |
171 return Qnil; | |
172 } | |
173 | |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
174 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
|
175 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
|
176 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
|
177 for example, (type-of 1) returns `integer'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
178 (Lisp_Object object) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
179 { |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
180 switch (XTYPE (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
181 { |
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
|
182 case_Lisp_Int: |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
183 return Qinteger; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
184 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
185 case Lisp_Symbol: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
186 return Qsymbol; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
187 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
188 case Lisp_String: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
189 return Qstring; |
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_Cons: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
192 return Qcons; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
193 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
194 case Lisp_Misc: |
11239
38aef18e8e3d
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
11219
diff
changeset
|
195 switch (XMISCTYPE (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
196 { |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
197 case Lisp_Misc_Marker: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
198 return Qmarker; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
199 case Lisp_Misc_Overlay: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
200 return Qoverlay; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
201 case Lisp_Misc_Float: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
202 return Qfloat; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
203 } |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
204 abort (); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
205 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
206 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
|
207 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
|
208 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
|
209 if (PROCESSP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
210 return Qprocess; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
211 if (WINDOWP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
212 return Qwindow; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
213 if (SUBRP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
214 return Qsubr; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
215 if (COMPILEDP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
216 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
|
217 if (BUFFERP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
218 return Qbuffer; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
219 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
|
220 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
|
221 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
|
222 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
|
223 if (FRAMEP (object)) |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
224 return Qframe; |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90863
diff
changeset
|
225 if (HASH_TABLE_P (object)) |
26185 | 226 return Qhash_table; |
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
227 if (FONT_SPEC_P (object)) |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
228 return Qfont_spec; |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
229 if (FONT_ENTITY_P (object)) |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
230 return Qfont_entity; |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
231 if (FONT_OBJECT_P (object)) |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
232 return Qfont_object; |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
233 return Qvector; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
234 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
235 case Lisp_Float: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
236 return Qfloat; |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
237 |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
238 default: |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
239 abort (); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
240 } |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
241 } |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
242 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
243 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
|
244 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
|
245 (Lisp_Object object) |
298 | 246 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
247 if (CONSP (object)) |
298 | 248 return Qt; |
249 return Qnil; | |
250 } | |
251 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
252 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
|
253 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
|
254 (Lisp_Object object) |
298 | 255 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
256 if (CONSP (object)) |
298 | 257 return Qnil; |
258 return Qt; | |
259 } | |
260 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
261 DEFUN ("listp", Flistp, Slistp, 1, 1, 0, |
68497 | 262 doc: /* Return t if OBJECT is a list, that is, a cons cell or nil. |
263 Otherwise, return nil. */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
264 (Lisp_Object object) |
298 | 265 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
266 if (CONSP (object) || NILP (object)) |
298 | 267 return Qt; |
268 return Qnil; | |
269 } | |
270 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
271 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
|
272 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
|
273 (Lisp_Object object) |
298 | 274 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
275 if (CONSP (object) || NILP (object)) |
298 | 276 return Qnil; |
277 return Qt; | |
278 } | |
279 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
280 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
|
281 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
|
282 (Lisp_Object object) |
298 | 283 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
284 if (SYMBOLP (object)) |
298 | 285 return Qt; |
286 return Qnil; | |
287 } | |
288 | |
26931 | 289 /* Define this in C to avoid unnecessarily consing up the symbol |
290 name. */ | |
291 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
|
292 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
|
293 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
|
294 interned in the initial obarray. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
295 (Lisp_Object object) |
26931 | 296 { |
297 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
|
298 && SREF (SYMBOL_NAME (object), 0) == ':' |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
299 && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object)) |
26931 | 300 return Qt; |
301 return Qnil; | |
302 } | |
303 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
304 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
|
305 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
|
306 (Lisp_Object object) |
298 | 307 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
308 if (VECTORP (object)) |
298 | 309 return Qt; |
310 return Qnil; | |
311 } | |
312 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
313 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
|
314 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
|
315 (Lisp_Object object) |
298 | 316 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
317 if (STRINGP (object)) |
298 | 318 return Qt; |
319 return Qnil; | |
320 } | |
321 | |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
322 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
|
323 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
324 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
|
325 (Lisp_Object object) |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
326 { |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
327 if (STRINGP (object) && STRING_MULTIBYTE (object)) |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
328 return Qt; |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
329 return Qnil; |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
330 } |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
331 |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
332 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
|
333 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
|
334 (Lisp_Object object) |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
335 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
336 if (CHAR_TABLE_P (object)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
337 return Qt; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
338 return Qnil; |
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 |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
341 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
|
342 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
|
343 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
|
344 (Lisp_Object object) |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
345 { |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
346 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
|
347 return Qt; |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
348 return Qnil; |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
349 } |
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
350 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
351 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
|
352 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
|
353 (Lisp_Object object) |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
354 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
355 if (BOOL_VECTOR_P (object)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
356 return Qt; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
357 return Qnil; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
358 } |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
359 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
360 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
|
361 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
|
362 (Lisp_Object object) |
298 | 363 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
364 if (ARRAYP (object)) |
298 | 365 return Qt; |
366 return Qnil; | |
367 } | |
368 | |
369 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
|
370 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
|
371 (register Lisp_Object object) |
298 | 372 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
373 if (CONSP (object) || NILP (object) || ARRAYP (object)) |
298 | 374 return Qt; |
375 return Qnil; | |
376 } | |
377 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
378 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
|
379 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
|
380 (Lisp_Object object) |
298 | 381 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
382 if (BUFFERP (object)) |
298 | 383 return Qt; |
384 return Qnil; | |
385 } | |
386 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
387 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
|
388 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
|
389 (Lisp_Object object) |
298 | 390 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
391 if (MARKERP (object)) |
298 | 392 return Qt; |
393 return Qnil; | |
394 } | |
395 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
396 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
|
397 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
|
398 (Lisp_Object object) |
298 | 399 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
400 if (SUBRP (object)) |
298 | 401 return Qt; |
402 return Qnil; | |
403 } | |
404 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
405 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
|
406 1, 1, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
407 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
|
408 (Lisp_Object object) |
298 | 409 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
410 if (COMPILEDP (object)) |
298 | 411 return Qt; |
412 return Qnil; | |
413 } | |
414 | |
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
415 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
|
416 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
|
417 (register Lisp_Object object) |
298 | 418 { |
88623
0d7705c8ee3c
(Fchar_or_string_p): Doc fix. Use CHARACTERP.
Dave Love <fx@gnu.org>
parents:
88368
diff
changeset
|
419 if (CHARACTERP (object) || STRINGP (object)) |
298 | 420 return Qt; |
421 return Qnil; | |
422 } | |
423 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
424 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
|
425 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
|
426 (Lisp_Object object) |
298 | 427 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
428 if (INTEGERP (object)) |
298 | 429 return Qt; |
430 return Qnil; | |
431 } | |
432 | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
433 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
|
434 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
|
435 (register Lisp_Object object) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
436 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
437 if (MARKERP (object) || INTEGERP (object)) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
438 return Qt; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
439 return Qnil; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
440 } |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
441 |
6385
e81e7c424e8a
(Fchar_or_string_p, Fintegerp, Fnatnump): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6201
diff
changeset
|
442 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
|
443 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
|
444 (Lisp_Object object) |
298 | 445 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
446 if (NATNUMP (object)) |
298 | 447 return Qt; |
448 return Qnil; | |
449 } | |
450 | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
451 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
|
452 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
|
453 (Lisp_Object object) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
454 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
455 if (NUMBERP (object)) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
456 return Qt; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
457 else |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
458 return Qnil; |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
459 } |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
460 |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
461 DEFUN ("number-or-marker-p", Fnumber_or_marker_p, |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
462 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
|
463 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
|
464 (Lisp_Object object) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
465 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
466 if (NUMBERP (object) || MARKERP (object)) |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
467 return Qt; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
468 return Qnil; |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
469 } |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
470 |
298 | 471 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
|
472 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
|
473 (Lisp_Object object) |
298 | 474 { |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
475 if (FLOATP (object)) |
298 | 476 return Qt; |
477 return Qnil; | |
478 } | |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
479 |
298 | 480 |
481 /* Extract and set components of lists */ | |
482 | |
483 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
|
484 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
|
485 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
|
486 |
68446
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
487 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
|
488 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
|
489 (register Lisp_Object list) |
298 | 490 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
491 return CAR (list); |
298 | 492 } |
493 | |
494 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
|
495 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
|
496 (Lisp_Object object) |
298 | 497 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
498 return CAR_SAFE (object); |
298 | 499 } |
500 | |
501 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
|
502 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
|
503 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
|
504 |
68446
8ad0f8c7115f
(Fcar, Fcdr): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68444
diff
changeset
|
505 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
|
506 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
|
507 (register Lisp_Object list) |
298 | 508 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
509 return CDR (list); |
298 | 510 } |
511 | |
512 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
|
513 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
|
514 (Lisp_Object object) |
298 | 515 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
516 return CDR_SAFE (object); |
298 | 517 } |
518 | |
519 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
|
520 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
|
521 (register Lisp_Object cell, Lisp_Object newcar) |
298 | 522 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
523 CHECK_CONS (cell); |
298 | 524 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
|
525 XSETCAR (cell, newcar); |
298 | 526 return newcar; |
527 } | |
528 | |
529 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
|
530 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
|
531 (register Lisp_Object cell, Lisp_Object newcdr) |
298 | 532 { |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
533 CHECK_CONS (cell); |
298 | 534 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
|
535 XSETCDR (cell, newcdr); |
298 | 536 return newcdr; |
537 } | |
538 | |
539 /* Extract and set components of symbols */ | |
540 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
541 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
|
542 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
|
543 (register Lisp_Object symbol) |
298 | 544 { |
545 Lisp_Object valcontents; | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
546 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
|
547 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
548 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
549 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
550 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
551 switch (sym->redirect) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
552 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
553 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
|
554 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
|
555 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
556 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
557 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
|
558 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
559 /* 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
|
560 set to Qunbound. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
561 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
562 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
563 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
564 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
|
565 valcontents = BLV_VALUE (blv); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
566 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
567 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
568 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
569 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
570 /* 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
|
571 set to Qunbound. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
572 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
573 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
574 } |
298 | 575 |
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
576 return (EQ (valcontents, Qunbound) ? Qnil : Qt); |
298 | 577 } |
578 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
579 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
|
580 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
|
581 (register Lisp_Object symbol) |
298 | 582 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
583 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
584 return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt); |
298 | 585 } |
586 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
587 DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
588 doc: /* Make SYMBOL's value be void. |
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
589 Return SYMBOL. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
590 (register Lisp_Object symbol) |
298 | 591 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
592 CHECK_SYMBOL (symbol); |
73838
a99be0fe5bd4
(Fmakunbound): Use SYMBOL_CONSTANT_P macro.
Juanma Barranquero <lekktu@gmail.com>
parents:
71973
diff
changeset
|
593 if (SYMBOL_CONSTANT_P (symbol)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
594 xsignal1 (Qsetting_constant, symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
595 Fset (symbol, Qunbound); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
596 return symbol; |
298 | 597 } |
598 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
599 DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0, |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
600 doc: /* Make SYMBOL's function definition be void. |
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
601 Return SYMBOL. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
602 (register Lisp_Object symbol) |
298 | 603 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
604 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
605 if (NILP (symbol) || EQ (symbol, Qt)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
606 xsignal1 (Qsetting_constant, symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
607 XSYMBOL (symbol)->function = Qunbound; |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
608 return symbol; |
298 | 609 } |
610 | |
611 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
|
612 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
|
613 (register Lisp_Object symbol) |
298 | 614 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
615 CHECK_SYMBOL (symbol); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
616 if (!EQ (XSYMBOL (symbol)->function, Qunbound)) |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
617 return XSYMBOL (symbol)->function; |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
618 xsignal1 (Qvoid_function, symbol); |
298 | 619 } |
620 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
621 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
|
622 doc: /* Return SYMBOL's property list. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
623 (register Lisp_Object symbol) |
298 | 624 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
625 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
626 return XSYMBOL (symbol)->plist; |
298 | 627 } |
628 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
629 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
|
630 doc: /* Return SYMBOL's name, a string. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
631 (register Lisp_Object symbol) |
298 | 632 { |
633 register Lisp_Object name; | |
634 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
635 CHECK_SYMBOL (symbol); |
45397
bc5d63652a0a
* data.c (Fkeywordp, Fsymbol_name, store_symval_forwarding)
Ken Raeburn <raeburn@raeburn.org>
parents:
42274
diff
changeset
|
636 name = SYMBOL_NAME (symbol); |
298 | 637 return name; |
638 } | |
639 | |
640 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
|
641 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
|
642 (register Lisp_Object symbol, Lisp_Object definition) |
298 | 643 { |
79083
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
644 register Lisp_Object function; |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
645 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
646 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
647 if (NILP (symbol) || EQ (symbol, Qt)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
648 xsignal1 (Qsetting_constant, symbol); |
79083
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
649 |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
650 function = XSYMBOL (symbol)->function; |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
651 |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
652 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
|
653 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
|
654 |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
655 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
|
656 Fput (symbol, Qautoload, XCDR (function)); |
de1e5c00a8ce
(Ffset): Save autoload of the function being set.
Juanma Barranquero <lekktu@gmail.com>
parents:
78260
diff
changeset
|
657 |
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
658 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
|
659 /* Handle automatic advice activation */ |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
660 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
|
661 { |
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
662 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
|
663 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
|
664 } |
16754
6ca8ed287a53
(Ffset): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16434
diff
changeset
|
665 return definition; |
298 | 666 } |
667 | |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
668 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
|
669 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. |
46521 | 670 Associates the function with the current load file, if any. |
671 The optional third argument DOCSTRING specifies the documentation string | |
672 for SYMBOL; if it is omitted or nil, SYMBOL uses the documentation string | |
673 determined by DEFINITION. */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
674 (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
|
675 { |
65600
bd15c2b64526
(Fdefalias): Signal an error if SYMBOL is not a symbol.
John Paul Wallington <jpw@pobox.com>
parents:
64770
diff
changeset
|
676 CHECK_SYMBOL (symbol); |
48723
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
677 if (CONSP (XSYMBOL (symbol)->function) |
a6906c113d14
(Fdefalias): Record in load-history redefining an autoload.
Richard M. Stallman <rms@gnu.org>
parents:
47276
diff
changeset
|
678 && 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
|
679 LOADHIST_ATTACH (Fcons (Qt, symbol)); |
25132
07b44154638f
(Fdefalias): Call Ffset instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
23602
diff
changeset
|
680 definition = Ffset (symbol, definition); |
59110
5feed0f86f52
(Fdefalias): Use (defun . FN_NAME) in LOADHIST_ATTACH.
Richard M. Stallman <rms@gnu.org>
parents:
58986
diff
changeset
|
681 LOADHIST_ATTACH (Fcons (Qdefun, symbol)); |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
682 if (!NILP (docstring)) |
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
683 Fput (symbol, Qfunction_documentation, docstring); |
16756
71113ba79b1b
(Fdefalias): Change argument name and doc string.
Richard M. Stallman <rms@gnu.org>
parents:
16754
diff
changeset
|
684 return definition; |
2548
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
685 } |
b66eeded6afc
(Fdefine_function): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2515
diff
changeset
|
686 |
298 | 687 DEFUN ("setplist", Fsetplist, Ssetplist, 2, 2, 0, |
52938 | 688 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
|
689 (register Lisp_Object symbol, Lisp_Object newplist) |
298 | 690 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
691 CHECK_SYMBOL (symbol); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
692 XSYMBOL (symbol)->plist = newplist; |
298 | 693 return newplist; |
694 } | |
648 | 695 |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
696 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
|
697 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
|
698 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
|
699 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
|
700 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
|
701 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
|
702 (Lisp_Object subr) |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
703 { |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
704 short minargs, maxargs; |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
705 CHECK_SUBR (subr); |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
706 minargs = XSUBR (subr)->min_args; |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
707 maxargs = XSUBR (subr)->max_args; |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
708 if (maxargs == MANY) |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
709 return Fcons (make_number (minargs), Qmany); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
710 else if (maxargs == UNEVALLED) |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
711 return Fcons (make_number (minargs), Qunevalled); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
712 else |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
713 return Fcons (make_number (minargs), make_number (maxargs)); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
714 } |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
715 |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
716 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
|
717 doc: /* Return name of subroutine SUBR. |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
718 SUBR must be a built-in function. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
719 (Lisp_Object subr) |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
720 { |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
721 const char *name; |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
722 CHECK_SUBR (subr); |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
723 name = XSUBR (subr)->symbol_name; |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
724 return make_string (name, strlen (name)); |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
725 } |
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
726 |
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
727 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
|
728 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
|
729 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
|
730 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
|
731 (Lisp_Object cmd) |
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
732 { |
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
733 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
|
734 |
82112
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
735 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
|
736 return Qnil; |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
737 |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
738 /* 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
|
739 function-documentation property. */ |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
740 fun = cmd; |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
741 while (SYMBOLP (fun)) |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
742 { |
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
743 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
|
744 if (!NILP (tmp)) |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
745 return tmp; |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
746 else |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
747 fun = Fsymbol_function (fun); |
dd8905ab6eaa
(Finteractive_form): Check for the presence of an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82103
diff
changeset
|
748 } |
54627
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 if (SUBRP (fun)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
751 { |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
752 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
|
753 if (spec) |
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
754 return list2 (Qinteractive, |
48251c264d8d
(Finteractive_form): If the interactive specification starts with a `(',
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
83648
diff
changeset
|
755 (*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
|
756 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
|
757 } |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
758 else if (COMPILEDP (fun)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
759 { |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
760 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
|
761 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
|
762 } |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
763 else if (CONSP (fun)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
764 { |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
765 Lisp_Object funcar = XCAR (fun); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
766 if (EQ (funcar, Qlambda)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
767 return Fassq (Qinteractive, Fcdr (XCDR (fun))); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
768 else if (EQ (funcar, Qautoload)) |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
769 { |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
770 struct gcpro gcpro1; |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
771 GCPRO1 (cmd); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
772 do_autoload (fun, cmd); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
773 UNGCPRO; |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
774 return Finteractive_form (cmd); |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
775 } |
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
776 } |
37053
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
777 return Qnil; |
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
778 } |
1a420f3df4f8
(Fsubr_interactive_form): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36819
diff
changeset
|
779 |
298 | 780 |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
781 /*********************************************************************** |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
782 Getting and Setting Values of Symbols |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
783 ***********************************************************************/ |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
784 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
785 /* Return the symbol holding SYMBOL's value. Signal |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
786 `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
|
787 indirections contains a loop. */ |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
788 |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
789 struct Lisp_Symbol * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
790 indirect_variable (struct Lisp_Symbol *symbol) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
791 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
792 struct Lisp_Symbol *tortoise, *hare; |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
793 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
794 hare = tortoise = symbol; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
795 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
796 while (hare->redirect == SYMBOL_VARALIAS) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
797 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
798 hare = SYMBOL_ALIAS (hare); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
799 if (hare->redirect != SYMBOL_VARALIAS) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
800 break; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
801 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
802 hare = SYMBOL_ALIAS (hare); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
803 tortoise = SYMBOL_ALIAS (tortoise); |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
804 |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
805 if (hare == tortoise) |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
806 { |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
807 Lisp_Object tem; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
808 XSETSYMBOL (tem, symbol); |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
809 xsignal1 (Qcyclic_variable_indirection, tem); |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
810 } |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
811 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
812 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
813 return hare; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
814 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
815 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
816 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
817 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
|
818 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
|
819 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
|
820 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
|
821 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
|
822 variable chain of symbols. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
823 (Lisp_Object object) |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
824 { |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
825 if (SYMBOLP (object)) |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
826 XSETSYMBOL (object, indirect_variable (XSYMBOL (object))); |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
827 return object; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
828 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
829 |
298 | 830 |
831 /* Given the raw contents of a symbol value cell, | |
832 return the Lisp value of the symbol. | |
833 This does not handle buffer-local variables; use | |
834 swap_in_symval_forwarding for that. */ | |
835 | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
836 #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
|
837 ((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
|
838 |
298 | 839 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
840 do_symval_forwarding (register union Lisp_Fwd *valcontents) |
298 | 841 { |
842 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
|
843 switch (XFWDTYPE (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
844 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
845 case Lisp_Fwd_Int: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
846 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
|
847 return val; |
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 case Lisp_Fwd_Bool: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
850 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
|
851 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
852 case Lisp_Fwd_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
853 return *XOBJFWD (valcontents)->objvar; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
854 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
855 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
|
856 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
|
857 XBUFFER_OBJFWD (valcontents)->offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
858 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
859 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
|
860 /* 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
|
861 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
|
862 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
|
863 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
864 (with-selected-frame frame |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
865 (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
|
866 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
867 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
|
868 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
|
869 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
|
870 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
|
871 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
|
872 + (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
|
873 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
874 } |
298 | 875 } |
876 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
877 /* 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
|
878 of SYMBOL. If SYMBOL is buffer-local, VALCONTENTS should be the |
298 | 879 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
|
880 step past the buffer-localness. |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
881 |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
882 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
|
883 current buffer. This only plays a role for per-buffer variables. */ |
298 | 884 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
885 #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
|
886 do { \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
887 if ((blv)->forwarded) \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
888 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
|
889 else \ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
890 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
|
891 } while (0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
892 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
893 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
894 store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf) |
298 | 895 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
896 switch (XFWDTYPE (valcontents)) |
298 | 897 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
898 case Lisp_Fwd_Int: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
899 CHECK_NUMBER (newval); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
900 *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
|
901 break; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
902 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
903 case Lisp_Fwd_Bool: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
904 *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
|
905 break; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
906 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
907 case Lisp_Fwd_Obj: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
908 *XOBJFWD (valcontents)->objvar = newval; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
909 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
910 /* 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
|
911 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
|
912 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
|
913 and update them. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
914 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
|
915 && 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
|
916 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
917 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
|
918 - (char *) &buffer_defaults); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
919 int idx = PER_BUFFER_IDX (offset); |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
920 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
921 Lisp_Object tail; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
922 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
923 if (idx <= 0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
924 break; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
925 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
926 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
|
927 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
928 Lisp_Object buf; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
929 struct buffer *b; |
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 buf = Fcdr (XCAR (tail)); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
932 if (!BUFFERP (buf)) continue; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
933 b = XBUFFER (buf); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
934 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
935 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
|
936 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
|
937 } |
9465
ea2ee8bd3c63
(do_symval_forwarding, store_symval_forwarding, find_symbol_value, Fset,
Karl Heuer <kwzh@gnu.org>
parents:
9369
diff
changeset
|
938 } |
298 | 939 break; |
940 | |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
941 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
|
942 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
943 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
|
944 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
|
945 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
946 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
|
947 || (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
|
948 ? INTEGERP (newval) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
949 : XTYPE (newval) == XINT (type)))) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
950 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
|
951 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
952 if (buf == NULL) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
953 buf = current_buffer; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
954 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
|
955 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
956 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
957 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
958 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
|
959 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
960 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
|
961 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
|
962 *(Lisp_Object *) p = newval; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
963 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
964 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
965 |
298 | 966 default: |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
967 abort (); /* goto def; */ |
298 | 968 } |
969 } | |
970 | |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
971 /* 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
|
972 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
|
973 |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
974 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
975 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
|
976 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
977 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
|
978 |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
979 /* 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
|
980 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
981 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
|
982 |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
983 /* 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
|
984 blv->valcell = blv->defcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
985 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
986 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
|
987 |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
988 /* 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
|
989 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
990 SET_BLV_FOUND (blv, 0); |
29618
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
991 } |
e38bc8c4c7b3
(swap_in_global_binding): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29237
diff
changeset
|
992 |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
993 /* 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
|
994 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
|
995 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
|
996 |
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
997 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
|
998 This could be another forwarding pointer. */ |
298 | 999 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1000 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1001 swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_Value *blv) |
298 | 1002 { |
1003 register Lisp_Object tem1; | |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
1004 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1005 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
|
1006 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1007 tem1 = blv->where; |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1008 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1009 if (NILP (tem1) |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1010 || (blv->frame_local |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1011 ? !EQ (selected_frame, tem1) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1012 : current_buffer != XBUFFER (tem1))) |
298 | 1013 { |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
1014 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1015 /* 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
|
1016 tem1 = blv->valcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1017 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1018 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
|
1019 /* 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
|
1020 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1021 Lisp_Object var; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1022 XSETSYMBOL (var, symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1023 if (blv->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1024 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1025 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
|
1026 blv->where = selected_frame; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1027 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1028 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1029 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1030 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
|
1031 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
|
1032 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1033 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1034 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
|
1035 tem1 = blv->defcell; |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1036 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1037 /* 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
|
1038 blv->valcell = tem1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1039 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1040 store_symval_forwarding (blv->fwd, BLV_VALUE (blv), NULL); |
298 | 1041 } |
1042 } | |
1043 | |
514 | 1044 /* Find the value of a symbol, returning Qunbound if it's not bound. |
1045 This is helpful for code which just wants to get a variable's value | |
14036 | 1046 if it has one, without signaling an error. |
514 | 1047 Note that it must not be possible to quit |
1048 within this function. Great care is required for this. */ | |
298 | 1049 |
514 | 1050 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1051 find_symbol_value (Lisp_Object symbol) |
298 | 1052 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1053 struct Lisp_Symbol *sym; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
1054 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1055 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1056 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1057 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1058 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1059 switch (sym->redirect) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1060 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1061 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
|
1062 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
|
1063 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1064 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1065 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
|
1066 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
|
1067 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
|
1068 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1069 /* FALLTHROUGH */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1070 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1071 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
|
1072 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1073 } |
298 | 1074 } |
1075 | |
514 | 1076 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
|
1077 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
|
1078 (Lisp_Object symbol) |
514 | 1079 { |
6497
89ff61b53cee
(store_symval_forwarding, Fsymbol_value): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6459
diff
changeset
|
1080 Lisp_Object val; |
514 | 1081 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1082 val = find_symbol_value (symbol); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1083 if (!EQ (val, Qunbound)) |
514 | 1084 return val; |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1085 |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1086 xsignal1 (Qvoid_variable, symbol); |
514 | 1087 } |
1088 | |
298 | 1089 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
|
1090 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
|
1091 (register Lisp_Object symbol, Lisp_Object newval) |
298 | 1092 { |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1093 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
|
1094 return newval; |
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1095 } |
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1096 |
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1097 /* 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
|
1098 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
|
1099 |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1100 static int |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1101 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
|
1102 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1103 struct specbinding *p; |
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1104 |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1105 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
|
1106 if (p->func == NULL |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1107 && CONSP (p->symbol)) |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1108 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1109 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
|
1110 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
|
1111 if (symbol == let_bound_symbol |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1112 && XBUFFER (XCDR (XCDR (p->symbol))) == current_buffer) |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1113 break; |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1114 } |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1115 |
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
1116 return p >= specpdl; |
27703
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1117 } |
2ff09a66fbf1
(set_internal): Don't make variable buffer-local
Richard M. Stallman <rms@gnu.org>
parents:
27388
diff
changeset
|
1118 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1119 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1120 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
|
1121 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1122 struct specbinding *p; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1123 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1124 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
|
1125 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
|
1126 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1127 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1128 return p >= specpdl; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1129 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1130 |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
1131 /* 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
|
1132 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
|
1133 (nil stands for the current buffer/frame). |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1134 |
16931
8bdfc6767130
(set_internal): New subroutine. New arg BINDFLAG.
Richard M. Stallman <rms@gnu.org>
parents:
16787
diff
changeset
|
1135 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
|
1136 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
|
1137 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
|
1138 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1139 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1140 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
|
1141 { |
9369
379c7b900689
(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Karl Heuer <kwzh@gnu.org>
parents:
9366
diff
changeset
|
1142 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
|
1143 struct Lisp_Symbol *sym; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1144 Lisp_Object tem1; |
298 | 1145 |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1146 /* 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
|
1147 /* 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
|
1148 return; */ |
27294
b62412c9ab2a
(set_internal): New arg BUF.
Richard M. Stallman <rms@gnu.org>
parents:
26931
diff
changeset
|
1149 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1150 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1151 if (SYMBOL_CONSTANT_P (symbol)) |
298 | 1152 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1153 if (NILP (Fkeywordp (symbol)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1154 || !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
|
1155 xsignal1 (Qsetting_constant, symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1156 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1157 /* 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
|
1158 return; |
298 | 1159 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1160 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1161 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1162 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1163 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1164 switch (sym->redirect) |
298 | 1165 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1166 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
|
1167 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
|
1168 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1169 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1170 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
|
1171 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
|
1172 { |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1173 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
|
1174 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
|
1175 else |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1176 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
|
1177 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1178 /* 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
|
1179 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
|
1180 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
|
1181 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
|
1182 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
|
1183 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
|
1184 /* 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
|
1185 || (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
|
1186 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1187 /* 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
|
1188 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
|
1189 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1190 /* 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
|
1191 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1192 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
|
1193 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1194 /* 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
|
1195 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
|
1196 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
|
1197 (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
|
1198 ? 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
|
1199 : 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
|
1200 blv->where = where; |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1201 blv->found = 1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1202 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1203 if (NILP (tem1)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1204 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1205 /* 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
|
1206 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1207 /* 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
|
1208 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
|
1209 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
|
1210 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
|
1211 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
|
1212 in the current buffer. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1213 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
|
1214 || 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
|
1215 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1216 blv->found = 0; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1217 tem1 = blv->defcell; |
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 /* 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
|
1220 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
|
1221 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
|
1222 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
|
1223 and load that binding. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1224 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1225 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1226 /* 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
|
1227 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
|
1228 eassert (!blv->frame_local); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1229 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
|
1230 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
|
1231 = 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
|
1232 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1233 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1234 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1235 /* 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
|
1236 blv->valcell = tem1; |
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 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1239 /* 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
|
1240 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
|
1241 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1242 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1243 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1244 if (voide) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1245 /* 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
|
1246 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
|
1247 blv->fwd = NULL; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1248 else |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1249 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
|
1250 BUFFERP (where) |
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1251 ? 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
|
1252 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1253 break; |
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 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1256 { |
108308
ee0a08d8887e
Try and fix unbind_to when localness of binding has changed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108023
diff
changeset
|
1257 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
|
1258 = 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
|
1259 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
|
1260 if (BUFFER_OBJFWDP (innercontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1261 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1262 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
|
1263 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
|
1264 if (idx > 0 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1265 && !bindflag |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1266 && !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
|
1267 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
|
1268 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1269 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1270 if (voide) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1271 { /* 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
|
1272 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
|
1273 sym->redirect = SYMBOL_PLAINVAL; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1274 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
|
1275 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1276 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1277 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
|
1278 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1279 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1280 default: abort (); |
298 | 1281 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1282 return; |
298 | 1283 } |
1284 | |
1285 /* Access or set a buffer-local symbol's default value. */ | |
1286 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1287 /* 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
|
1288 Return Qunbound if it is void. */ |
298 | 1289 |
1290 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1291 default_value (Lisp_Object symbol) |
298 | 1292 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1293 struct Lisp_Symbol *sym; |
298 | 1294 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1295 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1296 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1297 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1298 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1299 switch (sym->redirect) |
298 | 1300 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1301 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
|
1302 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
|
1303 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1304 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1305 /* 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
|
1306 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
|
1307 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
|
1308 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
|
1309 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
|
1310 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
|
1311 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
|
1312 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1313 return XCDR (blv->defcell); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1314 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1315 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1316 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1317 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
|
1318 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1319 /* 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
|
1320 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
|
1321 if (BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1322 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1323 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
|
1324 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
|
1325 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
|
1326 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1327 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1328 /* 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
|
1329 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
|
1330 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1331 default: abort (); |
298 | 1332 } |
1333 } | |
1334 | |
1335 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
|
1336 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
|
1337 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
|
1338 for this variable. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1339 (Lisp_Object symbol) |
298 | 1340 { |
1341 register Lisp_Object value; | |
1342 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1343 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
|
1344 return (EQ (value, Qunbound) ? Qnil : Qt); |
298 | 1345 } |
1346 | |
1347 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
|
1348 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
|
1349 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
|
1350 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
|
1351 local bindings in certain buffers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1352 (Lisp_Object symbol) |
298 | 1353 { |
1354 register Lisp_Object value; | |
1355 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1356 value = default_value (symbol); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1357 if (!EQ (value, Qunbound)) |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1358 return value; |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1359 |
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
1360 xsignal1 (Qvoid_variable, symbol); |
298 | 1361 } |
1362 | |
1363 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
|
1364 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
|
1365 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
|
1366 for this variable. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1367 (Lisp_Object symbol, Lisp_Object value) |
298 | 1368 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1369 struct Lisp_Symbol *sym; |
298 | 1370 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1371 CHECK_SYMBOL (symbol); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1372 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
|
1373 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1374 if (NILP (Fkeywordp (symbol)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1375 || !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
|
1376 xsignal1 (Qsetting_constant, symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1377 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1378 /* 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
|
1379 return value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1380 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1381 sym = XSYMBOL (symbol); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1382 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1383 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1384 switch (sym->redirect) |
298 | 1385 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1386 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
|
1387 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
|
1388 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1389 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1390 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
|
1391 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1392 /* 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
|
1393 XSETCDR (blv->defcell, value); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1394 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1395 /* 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
|
1396 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
|
1397 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
|
1398 return value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1399 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1400 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1401 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1402 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
|
1403 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1404 /* 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
|
1405 in the buffer. |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1406 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
|
1407 if (BUFFER_OBJFWDP (valcontents)) |
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 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
|
1410 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
|
1411 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1412 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
|
1413 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1414 /* 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
|
1415 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
|
1416 if (idx > 0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1417 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1418 struct buffer *b; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1419 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1420 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
|
1421 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
|
1422 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
|
1423 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1424 return value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1425 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1426 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1427 return Fset (symbol, value); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1428 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1429 default: abort (); |
298 | 1430 } |
1431 } | |
1432 | |
60064
896e880eab56
(Fsetq_default): Allow no arg case.
Richard M. Stallman <rms@gnu.org>
parents:
59110
diff
changeset
|
1433 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
|
1434 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
|
1435 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
|
1436 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
|
1437 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
|
1438 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
|
1439 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1440 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
|
1441 (setq-default VAR VALUE VAR VALUE...) |
f406ef28e71a
(Fsetq_default): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55230
diff
changeset
|
1442 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
|
1443 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
|
1444 of previous VARs. |
78140
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
1445 usage: (setq-default [VAR VALUE]...) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1446 (Lisp_Object args) |
298 | 1447 { |
1448 register Lisp_Object args_left; | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1449 register Lisp_Object val, symbol; |
298 | 1450 struct gcpro gcpro1; |
1451 | |
490 | 1452 if (NILP (args)) |
298 | 1453 return Qnil; |
1454 | |
1455 args_left = args; | |
1456 GCPRO1 (args); | |
1457 | |
1458 do | |
1459 { | |
1460 val = Feval (Fcar (Fcdr (args_left))); | |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1461 symbol = XCAR (args_left); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1462 Fset_default (symbol, val); |
46279
5f4ed17e4396
(Fdefalias): Add an optional `docstring' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45397
diff
changeset
|
1463 args_left = Fcdr (XCDR (args_left)); |
298 | 1464 } |
490 | 1465 while (!NILP (args_left)); |
298 | 1466 |
1467 UNGCPRO; | |
1468 return val; | |
1469 } | |
1470 | |
1278
0a0646ae381f
* data.c (Fmake_local_variable): If SYM forwards to a C variable,
Jim Blandy <jimb@redhat.com>
parents:
1263
diff
changeset
|
1471 /* 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
|
1472 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1473 union Lisp_Val_Fwd |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1474 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1475 Lisp_Object value; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1476 union Lisp_Fwd *fwd; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1477 }; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1478 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1479 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
|
1480 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
|
1481 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1482 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
|
1483 = 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
|
1484 Lisp_Object symbol; |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1485 Lisp_Object tem; |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1486 |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1487 XSETSYMBOL (symbol, sym); |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1488 tem = Fcons (symbol, (forwarded |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1489 ? do_symval_forwarding (valcontents.fwd) |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1490 : valcontents.value)); |
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
108005
diff
changeset
|
1491 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1492 /* 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
|
1493 or keyboard-local forwarding. */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1494 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
|
1495 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
|
1496 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
|
1497 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1498 blv->frame_local = 0; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1499 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
|
1500 blv->defcell = tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1501 blv->valcell = tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1502 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
|
1503 return blv; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1504 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1505 |
298 | 1506 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
|
1507 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
|
1508 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
|
1509 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
|
1510 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
|
1511 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
|
1512 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
|
1513 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
|
1514 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
|
1515 |
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1516 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
|
1517 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
|
1518 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1519 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
|
1520 (register Lisp_Object variable) |
298 | 1521 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1522 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
|
1523 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
|
1524 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
|
1525 int forwarded; |
298 | 1526 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1527 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1528 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1529 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1530 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1531 switch (sym->redirect) |
298 | 1532 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1533 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
|
1534 case SYMBOL_PLAINVAL: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1535 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
|
1536 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
|
1537 valcontents.value = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1538 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1539 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1540 blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1541 if (blv->frame_local) |
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", |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1543 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1544 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1545 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1546 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
|
1547 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
|
1548 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
|
1549 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1550 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
|
1551 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1552 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1553 default: abort (); |
298 | 1554 } |
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 if (sym->constant) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1557 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
|
1558 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1559 if (!blv) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1560 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1561 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
|
1562 sym->redirect = SYMBOL_LOCALIZED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1563 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
|
1564 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1565 Lisp_Object symbol; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1566 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
|
1567 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
|
1568 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
|
1569 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
|
1570 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1571 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1572 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1573 blv->local_if_set = 1; |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1574 return variable; |
298 | 1575 } |
1576 | |
1577 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
|
1578 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
|
1579 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
|
1580 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
|
1581 \(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
|
1582 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
|
1583 Return VARIABLE. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1584 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1585 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
|
1586 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
|
1587 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
|
1588 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1589 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
|
1590 (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
|
1591 works. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1592 |
58733
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1593 See also `make-variable-buffer-local'. |
947c0bab2dd9
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
58086
diff
changeset
|
1594 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1595 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
|
1596 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
|
1597 (register Lisp_Object variable) |
298 | 1598 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1599 register Lisp_Object tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1600 int forwarded; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1601 union Lisp_Val_Fwd valcontents; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1602 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
|
1603 struct Lisp_Buffer_Local_Value *blv = NULL; |
298 | 1604 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1605 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1606 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1607 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1608 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1609 switch (sym->redirect) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1610 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1611 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
|
1612 case SYMBOL_PLAINVAL: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1613 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
|
1614 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1615 blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1616 if (blv->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1617 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
|
1618 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1619 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1620 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1621 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
|
1622 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
|
1623 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
|
1624 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1625 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1626 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1627 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1628 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1629 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
|
1630 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
|
1631 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
|
1632 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1633 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
|
1634 : (forwarded && BUFFER_OBJFWDP (valcontents.fwd))) |
298 | 1635 { |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1636 tem = Fboundp (variable); |
298 | 1637 /* Make sure the symbol has a local value in this particular buffer, |
1638 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
|
1639 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
|
1640 return variable; |
298 | 1641 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1642 if (!blv) |
298 | 1643 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1644 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
|
1645 sym->redirect = SYMBOL_LOCALIZED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1646 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
|
1647 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1648 Lisp_Object symbol; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1649 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
|
1650 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
|
1651 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
|
1652 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
|
1653 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
|
1654 } |
298 | 1655 } |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1656 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1657 /* 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
|
1658 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
|
1659 tem = Fassq (variable, current_buffer->local_var_alist); |
490 | 1660 if (NILP (tem)) |
298 | 1661 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1662 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
|
1663 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
|
1664 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1665 |
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1666 /* 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
|
1667 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
|
1668 default value. */ |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1669 find_symbol_value (variable); |
13593
e27c32c7d428
(Fmake_local_variable): Call find_symbol_value
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1670 |
298 | 1671 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
|
1672 = Fcons (Fcons (variable, XCDR (blv->defcell)), |
298 | 1673 current_buffer->local_var_alist); |
1674 | |
1675 /* 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
|
1676 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
|
1677 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
|
1678 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1679 /* blv->valcell = blv->defcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1680 * 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
|
1681 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
|
1682 } |
298 | 1683 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1684 /* 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
|
1685 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
|
1686 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
|
1687 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
|
1688 if (blv->fwd) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1689 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
|
1690 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1691 return variable; |
298 | 1692 } |
1693 | |
1694 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
|
1695 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
|
1696 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
|
1697 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
|
1698 (register Lisp_Object variable) |
298 | 1699 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1700 register Lisp_Object tem; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1701 struct Lisp_Buffer_Local_Value *blv; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1702 struct Lisp_Symbol *sym; |
298 | 1703 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1704 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1705 sym = XSYMBOL (variable); |
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 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1708 switch (sym->redirect) |
298 | 1709 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1710 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
|
1711 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
|
1712 case SYMBOL_FORWARDED: |
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 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
|
1715 if (BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1716 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1717 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
|
1718 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
|
1719 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1720 if (idx > 0) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1721 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1722 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
|
1723 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
|
1724 = PER_BUFFER_DEFAULT (offset); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1725 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1726 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1727 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1728 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1729 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1730 blv = SYMBOL_BLV (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1731 if (blv->frame_local) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1732 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1733 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1734 default: abort (); |
298 | 1735 } |
1736 | |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1737 /* 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
|
1738 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
|
1739 tem = Fassq (variable, current_buffer->local_var_alist); |
490 | 1740 if (!NILP (tem)) |
9895
924f7b9ce544
(store_symval_forwarding, swap_in_symval_forwarding, Fset, default_value,
Karl Heuer <kwzh@gnu.org>
parents:
9889
diff
changeset
|
1741 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
|
1742 = Fdelq (tem, current_buffer->local_var_alist); |
298 | 1743 |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1744 /* 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
|
1745 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
|
1746 forwarded objects won't work right. */ |
298 | 1747 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1748 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
|
1749 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
|
1750 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1751 blv->where = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1752 /* blv->valcell = blv->defcell; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1753 * 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
|
1754 blv->found = 0; |
14745
f78162b0fc6e
(Fkill_local_variable): Call find_symbol_value directly,
Richard M. Stallman <rms@gnu.org>
parents:
14302
diff
changeset
|
1755 find_symbol_value (variable); |
14264
215d8ba39537
(kill-local-variable): didn't update the value of
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1756 } |
298 | 1757 } |
1758 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1759 return variable; |
298 | 1760 } |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1761 |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1762 /* 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
|
1763 |
97885 | 1764 /* Obsolete since 22.2. NB adjust doc of modify-frame-parameters |
1765 when/if this is removed. */ | |
1766 | |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1767 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
|
1768 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
|
1769 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
|
1770 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
|
1771 it just makes them possible. |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1772 |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1773 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
|
1774 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
|
1775 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
|
1776 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
|
1777 to have frame-local bindings at all. |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1778 |
33b15a14f9b3
(Fmake_variable_frame_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
66475
diff
changeset
|
1779 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
|
1780 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
|
1781 `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
|
1782 |
97886
8e29e47e574f
(Fmake_variable_frame_local): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97885
diff
changeset
|
1783 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
|
1784 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
|
1785 frame-local bindings). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1786 (register Lisp_Object variable) |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1787 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1788 int forwarded; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1789 union Lisp_Val_Fwd valcontents; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1790 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
|
1791 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
|
1792 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1793 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1794 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1795 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1796 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1797 switch (sym->redirect) |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1798 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1799 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
|
1800 case SYMBOL_PLAINVAL: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1801 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
|
1802 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
|
1803 valcontents.value = Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1804 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1805 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1806 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
|
1807 return variable; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1808 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1809 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
|
1810 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1811 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1812 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
|
1813 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
|
1814 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
|
1815 SDATA (SYMBOL_NAME (variable))); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1816 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1817 default: abort (); |
27778
f100dbd7e3a0
(Fmake_variable_buffer_local): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
27758
diff
changeset
|
1818 } |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1819 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1820 if (sym->constant) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1821 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
|
1822 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1823 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
|
1824 blv->frame_local = 1; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1825 sym->redirect = SYMBOL_LOCALIZED; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1826 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
|
1827 { |
734b50109edf
Warn rather than error when making a local var inside a let.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107984
diff
changeset
|
1828 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
|
1829 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
|
1830 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
|
1831 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
|
1832 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
|
1833 } |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1834 return variable; |
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1835 } |
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
1836 |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1837 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
|
1838 1, 2, 0, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
1839 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
|
1840 BUFFER defaults to the current buffer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1841 (register Lisp_Object variable, Lisp_Object buffer) |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1842 { |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1843 register struct buffer *buf; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1844 struct Lisp_Symbol *sym; |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1845 |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1846 if (NILP (buffer)) |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1847 buf = current_buffer; |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1848 else |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1849 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1850 CHECK_BUFFER (buffer); |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1851 buf = XBUFFER (buffer); |
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1852 } |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1853 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1854 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1855 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1856 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1857 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1858 switch (sym->redirect) |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1859 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1860 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
|
1861 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
|
1862 case SYMBOL_LOCALIZED: |
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 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
|
1865 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
|
1866 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
|
1867 XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
1868 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1869 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
|
1870 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1871 elt = XCAR (tail); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1872 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
|
1873 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1874 eassert (!blv->frame_local); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1875 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
|
1876 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1877 } |
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 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
|
1880 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1881 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1882 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1883 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1884 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
|
1885 if (BUFFER_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1886 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1887 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
|
1888 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
|
1889 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
|
1890 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1891 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1892 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1893 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1894 default: abort (); |
12113
d96b45f31afa
(Flocal_variable_p): New optional arg BUFFER.
Karl Heuer <kwzh@gnu.org>
parents:
12043
diff
changeset
|
1895 } |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
1896 } |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1897 |
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1898 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
|
1899 1, 2, 0, |
57618
1eb191c19f7f
(Flocal_variable_if_set_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56590
diff
changeset
|
1900 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
|
1901 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
|
1902 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
|
1903 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
|
1904 `(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
|
1905 BUFFER defaults to the current buffer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1906 (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
|
1907 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1908 struct Lisp_Symbol *sym; |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1909 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
1910 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1911 sym = XSYMBOL (variable); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1912 |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1913 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1914 switch (sym->redirect) |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1915 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1916 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
|
1917 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
|
1918 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1919 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1920 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
|
1921 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
|
1922 return Qt; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1923 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
|
1924 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
|
1925 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1926 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1927 /* 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
|
1928 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
|
1929 default: abort (); |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1930 } |
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
1931 } |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1932 |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1933 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
|
1934 1, 1, 0, |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1935 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
|
1936 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
|
1937 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
|
1938 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
|
1939 (register Lisp_Object variable) |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1940 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1941 struct Lisp_Symbol *sym; |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1942 |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1943 CHECK_SYMBOL (variable); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1944 sym = XSYMBOL (variable); |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1945 |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1946 /* 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
|
1947 find_symbol_value (variable); |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1948 |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1949 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1950 switch (sym->redirect) |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1951 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1952 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
|
1953 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
|
1954 case SYMBOL_FORWARDED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1955 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1956 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
|
1957 if (KBOARD_OBJFWDP (valcontents)) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1958 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
|
1959 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
|
1960 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1961 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1962 /* FALLTHROUGH */ |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1963 case SYMBOL_LOCALIZED: |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1964 /* 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
|
1965 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
|
1966 if (!NILP (Flocal_variable_p (variable, Qnil))) |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1967 return Fcurrent_buffer (); |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1968 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
|
1969 && 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
|
1970 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
|
1971 else |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1972 return Qnil; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107460
diff
changeset
|
1973 default: abort (); |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1974 } |
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1975 } |
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
|
1976 |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
1977 /* 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
|
1978 keyboard-local-values. */ |
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
1979 #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
|
1980 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
|
1981 |
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 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
|
1983 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
|
1984 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
|
1985 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
|
1986 |
103052
e68707cf48a5
* keyboard.c (Fset_input_meta_mode): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102718
diff
changeset
|
1987 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
|
1988 selected frame's terminal device). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1989 (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
|
1990 { |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
1991 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
|
1992 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
|
1993 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
|
1994 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
|
1995 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
|
1996 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
|
1997 } |
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 |
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 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
|
2000 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
|
2001 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
|
2002 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
|
2003 |
103052
e68707cf48a5
* keyboard.c (Fset_input_meta_mode): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
102718
diff
changeset
|
2004 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
|
2005 selected frame's terminal device). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2006 (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
|
2007 { |
9e41c80c6389
Work around nondeterministic binding of terminal-local variables. (Fixes national character input on ttys.)
Karoly Lorentey <lorentey@elte.hu>
parents:
61888
diff
changeset
|
2008 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
|
2009 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
|
2010 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
|
2011 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
|
2012 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
|
2013 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
|
2014 } |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
2015 #endif |
298 | 2016 |
648 | 2017 /* Find the function at the end of a chain of symbol function indirections. */ |
2018 | |
2019 /* If OBJECT is a symbol, find the end of its function chain and | |
2020 return the value found there. If OBJECT is not a symbol, just | |
2021 return it. If there is a cycle in the function chain, signal a | |
2022 cyclic-function-indirection error. | |
2023 | |
2024 This is like Findirect_function, except that it doesn't signal an | |
2025 error if the chain ends up unbound. */ | |
2026 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2027 indirect_function (register Lisp_Object object) |
648 | 2028 { |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2029 Lisp_Object tortoise, hare; |
648 | 2030 |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2031 hare = tortoise = object; |
648 | 2032 |
2033 for (;;) | |
2034 { | |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2035 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
648 | 2036 break; |
2037 hare = XSYMBOL (hare)->function; | |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2038 if (!SYMBOLP (hare) || EQ (hare, Qunbound)) |
648 | 2039 break; |
2040 hare = XSYMBOL (hare)->function; | |
2041 | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2042 tortoise = XSYMBOL (tortoise)->function; |
648 | 2043 |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3529
diff
changeset
|
2044 if (EQ (hare, tortoise)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2045 xsignal1 (Qcyclic_function_indirection, object); |
648 | 2046 } |
2047 | |
2048 return hare; | |
2049 } | |
2050 | |
68758
13c1b7c5f555
* data.c (Findirect_function): Add NOERROR arg. All callers changed
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
2051 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
|
2052 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
|
2053 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
|
2054 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
|
2055 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
|
2056 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
|
2057 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
|
2058 function chain of symbols. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2059 (register Lisp_Object object, Lisp_Object noerror) |
648 | 2060 { |
2061 Lisp_Object result; | |
2062 | |
71871
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2063 /* Optimize for no indirection. */ |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2064 result = object; |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2065 if (SYMBOLP (result) && !EQ (result, Qunbound) |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2066 && (result = XSYMBOL (result)->function, SYMBOLP (result))) |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2067 result = indirect_function (result); |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2068 if (!EQ (result, Qunbound)) |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2069 return result; |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2070 |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2071 if (NILP (noerror)) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2072 xsignal1 (Qvoid_function, object); |
71871
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2073 |
dcd566ed4e9b
(Findirect_function): Optimize for no indirection.
Kim F. Storm <storm@cua.dk>
parents:
71830
diff
changeset
|
2074 return Qnil; |
648 | 2075 } |
2076 | |
298 | 2077 /* Extract and set vector and string elements */ |
2078 | |
2079 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
|
2080 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
|
2081 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
|
2082 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
|
2083 (register Lisp_Object array, Lisp_Object idx) |
298 | 2084 { |
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
|
2085 register EMACS_INT idxval; |
298 | 2086 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2087 CHECK_NUMBER (idx); |
298 | 2088 idxval = XINT (idx); |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2089 if (STRINGP (array)) |
298 | 2090 { |
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
|
2091 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
|
2092 EMACS_INT idxval_byte; |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2093 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2094 if (idxval < 0 || idxval >= SCHARS (array)) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2095 args_out_of_range (array, idx); |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2096 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
|
2097 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
|
2098 idxval_byte = string_char_to_byte (array, idxval); |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2099 |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105885
diff
changeset
|
2100 c = STRING_CHAR (SDATA (array) + idxval_byte); |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2101 return make_number (c); |
298 | 2102 } |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2103 else if (BOOL_VECTOR_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2104 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2105 int val; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2106 |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2107 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2108 args_out_of_range (array, idx); |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2109 |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2110 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
|
2111 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
|
2112 } |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2113 else if (CHAR_TABLE_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2114 { |
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2115 CHECK_CHARACTER (idx); |
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2116 return CHAR_TABLE_REF (array, idxval); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2117 } |
298 | 2118 else |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2119 { |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2120 int size = 0; |
10290
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2121 if (VECTORP (array)) |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2122 size = XVECTOR (array)->size; |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2123 else if (COMPILEDP (array)) |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2124 size = XVECTOR (array)->size & PSEUDOVECTOR_SIZE_MASK; |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2125 else |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2126 wrong_type_argument (Qarrayp, array); |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2127 |
1bcc91a4b210
(Faref): Handle compiled function as pseudovector.
Richard M. Stallman <rms@gnu.org>
parents:
10248
diff
changeset
|
2128 if (idxval < 0 || idxval >= size) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2129 args_out_of_range (array, idx); |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2130 return XVECTOR (array)->contents[idxval]; |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2131 } |
298 | 2132 } |
2133 | |
2134 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
|
2135 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
|
2136 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
|
2137 bool-vector. IDX starts at 0. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2138 (register Lisp_Object array, Lisp_Object idx, Lisp_Object newelt) |
298 | 2139 { |
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
|
2140 register EMACS_INT idxval; |
298 | 2141 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2142 CHECK_NUMBER (idx); |
298 | 2143 idxval = XINT (idx); |
71830
d1cea7530d3d
(wrong_type_argument): Remove loop around Fsignal.
Kim F. Storm <storm@cua.dk>
parents:
69928
diff
changeset
|
2144 CHECK_ARRAY (array, Qarrayp); |
298 | 2145 CHECK_IMPURE (array); |
2146 | |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2147 if (VECTORP (array)) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2148 { |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2149 if (idxval < 0 || idxval >= XVECTOR (array)->size) |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2150 args_out_of_range (array, idx); |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2151 XVECTOR (array)->contents[idxval] = newelt; |
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2152 } |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2153 else if (BOOL_VECTOR_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2154 { |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2155 int val; |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2156 |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2157 if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2158 args_out_of_range (array, idx); |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2159 |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2160 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
|
2161 |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2162 if (! NILP (newelt)) |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2163 val |= 1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2164 else |
55160
5b975496f8d9
(Faref, Faset): Use BOOL_VECTOR_BITS_PER_CHAR instead of
Andreas Schwab <schwab@suse.de>
parents:
54660
diff
changeset
|
2165 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
|
2166 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
|
2167 } |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2168 else if (CHAR_TABLE_P (array)) |
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2169 { |
88368
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2170 CHECK_CHARACTER (idx); |
1b036641f108
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42274
diff
changeset
|
2171 CHAR_TABLE_SET (array, idxval, newelt); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
2172 } |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2173 else if (STRING_MULTIBYTE (array)) |
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2174 { |
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
|
2175 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
|
2176 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
|
2177 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2178 if (idxval < 0 || idxval >= SCHARS (array)) |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2179 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
|
2180 CHECK_CHARACTER (newelt); |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2181 |
50632
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2182 nbytes = SBYTES (array); |
bd83590b911a
(Faset): Calculate nbytes earlier, to satisfy the now pickier
Miles Bader <miles@gnu.org>
parents:
50314
diff
changeset
|
2183 |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2184 idxval_byte = string_char_to_byte (array, idxval); |
46422
50a2414d96b7
* data.c (Faref): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2185 p1 = SDATA (array) + idxval_byte; |
108881
5582106cddf0
Remove obsolete pre-unicode2 macros.
Juanma Barranquero <lekktu@gmail.com>
parents:
108308
diff
changeset
|
2186 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
|
2187 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
|
2188 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
|
2189 { |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2190 /* 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
|
2191 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
|
2192 unsigned char *str; |
56193 | 2193 USE_SAFE_ALLOCA; |
2194 | |
2195 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
|
2196 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
|
2197 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
|
2198 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
|
2199 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
|
2200 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
|
2201 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
|
2202 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
|
2203 SAFE_FREE (); |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2204 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
|
2205 } |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2206 while (new_bytes--) |
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2207 *p1++ = *p0++; |
20617
20957e3ca2f5
(Fmultibyte_string_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20122
diff
changeset
|
2208 } |
298 | 2209 else |
2210 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46279
diff
changeset
|
2211 if (idxval < 0 || idxval >= SCHARS (array)) |
9966
d64bdd958254
(Farray_length): Delete this obsolete function.
Karl Heuer <kwzh@gnu.org>
parents:
9954
diff
changeset
|
2212 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
|
2213 CHECK_NUMBER (newelt); |
30356
b600a31684db
(Faset): Allow storing any multibyte character in a string. Convert
Kenichi Handa <handa@m17n.org>
parents:
29735
diff
changeset
|
2214 |
90321
344d06a17979
(Faset): On setting a character bigger than 255 in a
Kenichi Handa <handa@m17n.org>
parents:
90295
diff
changeset
|
2215 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
|
2216 { |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2217 int i; |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2218 |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2219 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
|
2220 if (SREF (array, i) >= 0x80) |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2221 args_out_of_range (array, newelt); |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2222 /* 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
|
2223 string, and try `aset' again. */ |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2224 STRING_SET_MULTIBYTE (array); |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2225 return Faset (array, idx, newelt); |
c7f0faccd3c2
(Faset): Allow setting a multibyte character in an
Kenichi Handa <handa@m17n.org>
parents:
93259
diff
changeset
|
2226 } |
90321
344d06a17979
(Faset): On setting a character bigger than 255 in a
Kenichi Handa <handa@m17n.org>
parents:
90295
diff
changeset
|
2227 SSET (array, idxval, XINT (newelt)); |
298 | 2228 } |
2229 | |
2230 return newelt; | |
2231 } | |
2232 | |
2233 /* Arithmetic functions */ | |
2234 | |
2235 enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal }; | |
2236 | |
2237 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2238 arithcompare (Lisp_Object num1, Lisp_Object num2, enum comparison comparison) |
298 | 2239 { |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
30356
diff
changeset
|
2240 double f1 = 0, f2 = 0; |
298 | 2241 int floatp = 0; |
2242 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2243 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
|
2244 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2); |
298 | 2245 |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2246 if (FLOATP (num1) || FLOATP (num2)) |
298 | 2247 { |
2248 floatp = 1; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2249 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
|
2250 f2 = (FLOATP (num2)) ? XFLOAT_DATA (num2) : XINT (num2); |
298 | 2251 } |
2252 | |
2253 switch (comparison) | |
2254 { | |
2255 case equal: | |
2256 if (floatp ? f1 == f2 : XINT (num1) == XINT (num2)) | |
2257 return Qt; | |
2258 return Qnil; | |
2259 | |
2260 case notequal: | |
2261 if (floatp ? f1 != f2 : XINT (num1) != XINT (num2)) | |
2262 return Qt; | |
2263 return Qnil; | |
2264 | |
2265 case less: | |
2266 if (floatp ? f1 < f2 : XINT (num1) < XINT (num2)) | |
2267 return Qt; | |
2268 return Qnil; | |
2269 | |
2270 case less_or_equal: | |
2271 if (floatp ? f1 <= f2 : XINT (num1) <= XINT (num2)) | |
2272 return Qt; | |
2273 return Qnil; | |
2274 | |
2275 case grtr: | |
2276 if (floatp ? f1 > f2 : XINT (num1) > XINT (num2)) | |
2277 return Qt; | |
2278 return Qnil; | |
2279 | |
2280 case grtr_or_equal: | |
2281 if (floatp ? f1 >= f2 : XINT (num1) >= XINT (num2)) | |
2282 return Qt; | |
2283 return Qnil; | |
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2284 |
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2285 default: |
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2286 abort (); |
298 | 2287 } |
2288 } | |
2289 | |
2290 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
|
2291 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
|
2292 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2293 { |
2294 return arithcompare (num1, num2, equal); | |
2295 } | |
2296 | |
2297 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
|
2298 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
|
2299 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2300 { |
2301 return arithcompare (num1, num2, less); | |
2302 } | |
2303 | |
2304 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
|
2305 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
|
2306 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2307 { |
2308 return arithcompare (num1, num2, grtr); | |
2309 } | |
2310 | |
2311 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
|
2312 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
|
2313 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, less_or_equal); | |
2317 } | |
2318 | |
2319 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
|
2320 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
|
2321 Both must be numbers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2322 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2323 { |
2324 return arithcompare (num1, num2, grtr_or_equal); | |
2325 } | |
2326 | |
2327 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
|
2328 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
|
2329 (register Lisp_Object num1, Lisp_Object num2) |
298 | 2330 { |
2331 return arithcompare (num1, num2, notequal); | |
2332 } | |
2333 | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2334 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
|
2335 doc: /* Return t if NUMBER is zero. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2336 (register Lisp_Object number) |
298 | 2337 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2338 CHECK_NUMBER_OR_FLOAT (number); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2339 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2340 if (FLOATP (number)) |
298 | 2341 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2342 if (XFLOAT_DATA (number) == 0.0) |
298 | 2343 return Qt; |
2344 return Qnil; | |
2345 } | |
2346 | |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2347 if (!XINT (number)) |
298 | 2348 return Qt; |
2349 return Qnil; | |
2350 } | |
2351 | |
78140
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2352 /* Convert between long values and pairs of Lisp integers. |
53bf760678a9
(Fsetq_default): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77909
diff
changeset
|
2353 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
|
2354 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
|
2355 |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2356 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2357 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
|
2358 { |
50109
d23ab2416c49
(long_to_cons): Fix type of top.
Andreas Schwab <schwab@suse.de>
parents:
48996
diff
changeset
|
2359 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
|
2360 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
|
2361 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
|
2362 return make_number (bot); |
11879
606889516975
(long_to_cons): Don't assume 32-bit longs.
Karl Heuer <kwzh@gnu.org>
parents:
11734
diff
changeset
|
2363 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
|
2364 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
|
2365 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
|
2366 } |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2367 |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2368 unsigned long |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2369 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
|
2370 { |
3675
f42eaf84478f
(cons_to_long): Declare top, bot as Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
2371 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
|
2372 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
|
2373 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
|
2374 top = XCAR (c); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2375 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
|
2376 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
|
2377 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
|
2378 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
|
2379 } |
c0cdd6a80391
long_to_cons and cons_to_long are generally useful things; they're
Jim Blandy <jimb@redhat.com>
parents:
2429
diff
changeset
|
2380 |
2429
96b55f2f19cd
Rename int-to-string to number-to-string, since it can handle
Jim Blandy <jimb@redhat.com>
parents:
2092
diff
changeset
|
2381 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
|
2382 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
|
2383 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
|
2384 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
|
2385 (Lisp_Object number) |
298 | 2386 { |
12528
ed5b91dd829a
(Fnumber_to_string): Make `buffer' long enough.
Karl Heuer <kwzh@gnu.org>
parents:
12295
diff
changeset
|
2387 char buffer[VALBITS]; |
298 | 2388 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2389 CHECK_NUMBER_OR_FLOAT (number); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2390 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2391 if (FLOATP (number)) |
298 | 2392 { |
2393 char pigbuf[350]; /* see comments in float_to_string */ | |
2394 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2395 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
|
2396 return build_string (pigbuf); |
298 | 2397 } |
2398 | |
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2399 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
|
2400 sprintf (buffer, "%d", (int) XINT (number)); |
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2401 else if (sizeof (long) == sizeof (EMACS_INT)) |
25780
18cf58ed9400
(find_symbol_value): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25665
diff
changeset
|
2402 sprintf (buffer, "%ld", (long) XINT (number)); |
11701
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2403 else |
d0eaa6b6dc72
(Fnumber_to_string, Fstring_to_number):
Richard M. Stallman <rms@gnu.org>
parents:
11688
diff
changeset
|
2404 abort (); |
298 | 2405 return build_string (buffer); |
2406 } | |
2407 | |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2408 INLINE static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2409 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
|
2410 { |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2411 int digit; |
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 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
|
2414 digit = character - '0'; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2415 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
|
2416 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
|
2417 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
|
2418 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
|
2419 else |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2420 return -1; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2421 |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2422 if (digit >= base) |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2423 return -1; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2424 else |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2425 return digit; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
2426 } |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2427 |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2428 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
|
2429 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
|
2430 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
|
2431 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
|
2432 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40116
diff
changeset
|
2433 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
|
2434 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
|
2435 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
|
2436 (register Lisp_Object string, Lisp_Object base) |
298 | 2437 { |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2438 register unsigned char *p; |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2439 register int b; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2440 int sign = 1; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2441 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
|
2442 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2443 CHECK_STRING (string); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2444 |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2445 if (NILP (base)) |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2446 b = 10; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2447 else |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2448 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2449 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
|
2450 b = XINT (base); |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2451 if (b < 2 || b > 16) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2452 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
|
2453 } |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2454 |
1914
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2455 /* 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
|
2456 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
|
2457 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
|
2458 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
|
2459 p++; |
60965a5c325f
* data.c (Fstring_to_number): Skip initial spaces, to make Emacs
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2460 |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2461 if (*p == '-') |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2462 { |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2463 sign = -1; |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2464 p++; |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2465 } |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2466 else if (*p == '+') |
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2467 p++; |
48961
39ba2cdf869e
(Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
Francesco Potortì <pot@gnu.org>
parents:
48723
diff
changeset
|
2468 |
106406
b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
Juanma Barranquero <lekktu@gmail.com>
parents:
106185
diff
changeset
|
2469 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
|
2470 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
|
2471 else |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2472 { |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2473 double v = 0; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2474 |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2475 while (1) |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2476 { |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2477 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
|
2478 if (digit < 0) |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2479 break; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2480 v = v * b + digit; |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2481 } |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2482 |
39775
280975f8c65e
(Fstring_to_number): Use make_fixnum_or_float.
Gerd Moellmann <gerd@gnu.org>
parents:
39767
diff
changeset
|
2483 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
|
2484 } |
27826
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2485 |
1a0a62bd23c4
(Fstring_to_number): If number is greater than what
Gerd Moellmann <gerd@gnu.org>
parents:
27818
diff
changeset
|
2486 return val; |
298 | 2487 } |
17780
df8d082029a6
(wrong_type_argument): Pass new arg to Fstring_to_number.
Richard M. Stallman <rms@gnu.org>
parents:
17319
diff
changeset
|
2488 |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2489 |
298 | 2490 enum arithop |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2491 { |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2492 Aadd, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2493 Asub, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2494 Amult, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2495 Adiv, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2496 Alogand, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2497 Alogior, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2498 Alogxor, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2499 Amax, |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2500 Amin |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2501 }; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2502 |
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
|
2503 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
|
2504 int, Lisp_Object *); |
298 | 2505 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2506 arith_driver (enum arithop code, int nargs, register Lisp_Object *args) |
298 | 2507 { |
2508 register Lisp_Object val; | |
2509 register int argnum; | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2510 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
|
2511 register EMACS_INT next; |
298 | 2512 |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2513 switch (SWITCH_ENUM_CAST (code)) |
298 | 2514 { |
2515 case Alogior: | |
2516 case Alogxor: | |
2517 case Aadd: | |
2518 case Asub: | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2519 accum = 0; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2520 break; |
298 | 2521 case Amult: |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2522 accum = 1; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2523 break; |
298 | 2524 case Alogand: |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2525 accum = -1; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2526 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2527 default: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2528 break; |
298 | 2529 } |
2530 | |
2531 for (argnum = 0; argnum < nargs; argnum++) | |
2532 { | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2533 /* 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
|
2534 val = args[argnum]; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2535 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
298 | 2536 |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2537 if (FLOATP (val)) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2538 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
|
2539 nargs, args); |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2540 args[argnum] = val; |
298 | 2541 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
|
2542 switch (SWITCH_ENUM_CAST (code)) |
298 | 2543 { |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2544 case Aadd: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2545 accum += next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2546 break; |
298 | 2547 case Asub: |
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2548 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
298 | 2549 break; |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2550 case Amult: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2551 accum *= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2552 break; |
298 | 2553 case Adiv: |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2554 if (!argnum) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2555 accum = next; |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2556 else |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2557 { |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2558 if (next == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2559 xsignal0 (Qarith_error); |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2560 accum /= next; |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2561 } |
298 | 2562 break; |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2563 case Alogand: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2564 accum &= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2565 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2566 case Alogior: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2567 accum |= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2568 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2569 case Alogxor: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2570 accum ^= next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2571 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2572 case Amax: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2573 if (!argnum || next > accum) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2574 accum = next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2575 break; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2576 case Amin: |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2577 if (!argnum || next < accum) |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2578 accum = next; |
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2579 break; |
298 | 2580 } |
2581 } | |
2582 | |
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2583 XSETINT (val, accum); |
298 | 2584 return val; |
2585 } | |
2586 | |
6201 | 2587 #undef isnan |
2588 #define isnan(x) ((x) != (x)) | |
2589 | |
36819
c21e776b768a
(store_symval_forwarding): Add parameter BUF. If BUF is
Gerd Moellmann <gerd@gnu.org>
parents:
34964
diff
changeset
|
2590 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2591 float_arith_driver (double accum, register int argnum, enum arithop code, int nargs, register Lisp_Object *args) |
298 | 2592 { |
2593 register Lisp_Object val; | |
2594 double next; | |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2595 |
298 | 2596 for (; argnum < nargs; argnum++) |
2597 { | |
2598 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
|
2599 CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val); |
298 | 2600 |
9147
ee9adbda1ad1
(wrong_type_argument, Fconsp, Fatom, Flistp, Fnlistp, Fsymbolp, Fvectorp,
Karl Heuer <kwzh@gnu.org>
parents:
9035
diff
changeset
|
2601 if (FLOATP (val)) |
298 | 2602 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2603 next = XFLOAT_DATA (val); |
298 | 2604 } |
2605 else | |
2606 { | |
2607 args[argnum] = val; /* runs into a compiler bug. */ | |
2608 next = XINT (args[argnum]); | |
2609 } | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10290
diff
changeset
|
2610 switch (SWITCH_ENUM_CAST (code)) |
298 | 2611 { |
2612 case Aadd: | |
2613 accum += next; | |
2614 break; | |
2615 case Asub: | |
23148
10e261360159
(arith_driver, float_arith_driver): Compute (- x) by
Paul Eggert <eggert@twinsun.com>
parents:
23129
diff
changeset
|
2616 accum = argnum ? accum - next : nargs == 1 ? - next : next; |
298 | 2617 break; |
2618 case Amult: | |
2619 accum *= next; | |
2620 break; | |
2621 case Adiv: | |
2622 if (!argnum) | |
2623 accum = next; | |
2624 else | |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2625 { |
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2626 if (! IEEE_FLOATING_POINT && next == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2627 xsignal0 (Qarith_error); |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2628 accum /= next; |
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2629 } |
298 | 2630 break; |
2631 case Alogand: | |
2632 case Alogior: | |
2633 case Alogxor: | |
2634 return wrong_type_argument (Qinteger_or_marker_p, val); | |
2635 case Amax: | |
6201 | 2636 if (!argnum || isnan (next) || next > accum) |
298 | 2637 accum = next; |
2638 break; | |
2639 case Amin: | |
6201 | 2640 if (!argnum || isnan (next) || next < accum) |
298 | 2641 accum = next; |
2642 break; | |
2643 } | |
2644 } | |
2645 | |
2646 return make_float (accum); | |
2647 } | |
27727
9400865ec7cf
Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents:
27703
diff
changeset
|
2648 |
298 | 2649 |
2650 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
|
2651 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
|
2652 usage: (+ &rest NUMBERS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2653 (int nargs, Lisp_Object *args) |
298 | 2654 { |
2655 return arith_driver (Aadd, nargs, args); | |
2656 } | |
2657 | |
2658 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
|
2659 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
|
2660 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
|
2661 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
|
2662 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
|
2663 (int nargs, Lisp_Object *args) |
298 | 2664 { |
2665 return arith_driver (Asub, nargs, args); | |
2666 } | |
2667 | |
2668 DEFUN ("*", Ftimes, Stimes, 0, MANY, 0, | |
41153 | 2669 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
|
2670 usage: (* &rest NUMBERS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2671 (int nargs, Lisp_Object *args) |
298 | 2672 { |
2673 return arith_driver (Amult, nargs, args); | |
2674 } | |
2675 | |
2676 DEFUN ("/", Fquo, Squo, 2, MANY, 0, | |
41153 | 2677 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
|
2678 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
|
2679 usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2680 (int nargs, Lisp_Object *args) |
298 | 2681 { |
55440
1ca30263e9d4
(Fquo): If any argument is float, do the computation in floating point.
Juanma Barranquero <lekktu@gmail.com>
parents:
55378
diff
changeset
|
2682 int argnum; |
55455 | 2683 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
|
2684 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
|
2685 return float_arith_driver (0, 0, Adiv, nargs, args); |
298 | 2686 return arith_driver (Adiv, nargs, args); |
2687 } | |
2688 | |
2689 DEFUN ("%", Frem, Srem, 2, 2, 0, | |
41153 | 2690 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
|
2691 Both must be integers or markers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2692 (register Lisp_Object x, Lisp_Object y) |
298 | 2693 { |
2694 Lisp_Object val; | |
2695 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2696 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
|
2697 CHECK_NUMBER_COERCE_MARKER (y); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2698 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2699 if (XFASTINT (y) == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2700 xsignal0 (Qarith_error); |
3338
30b946dd8c66
(float_arith_driver): Detect division by zero in advance.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
2701 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2702 XSETINT (val, XINT (x) % XINT (y)); |
298 | 2703 return val; |
2704 } | |
2705 | |
5776
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2706 #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
|
2707 double |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2708 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
|
2709 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
|
2710 { |
16945
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2711 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
|
2712 |
13296
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2713 if (f2 < 0.0) |
76034e1fc62e
[!HAVE_FMOD] (fmod): Make consistent with ANSI definition.
Karl Heuer <kwzh@gnu.org>
parents:
13200
diff
changeset
|
2714 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
|
2715 |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2716 /* 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
|
2717 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
|
2718 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
|
2719 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
|
2720 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
|
2721 do |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2722 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
|
2723 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
|
2724 |
d6cd00b2e214
(isnan): Define even if LISP_FLOAT_TYPE is not defined, since fmod
Paul Eggert <eggert@twinsun.com>
parents:
16931
diff
changeset
|
2725 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
|
2726 } |
6130ebde8d3b
(fmod): Implement it on systems where it's missing, using drem if available.
Karl Heuer <kwzh@gnu.org>
parents:
5729
diff
changeset
|
2727 #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
|
2728 |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2729 DEFUN ("mod", Fmod, Smod, 2, 2, 0, |
41153 | 2730 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
|
2731 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
|
2732 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
|
2733 (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
|
2734 { |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2735 Lisp_Object val; |
11688
f1e6033d8aca
(arith_driver): Make accum and next EMACS_INTs.
Richard M. Stallman <rms@gnu.org>
parents:
11341
diff
changeset
|
2736 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
|
2737 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2738 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
|
2739 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
|
2740 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2741 if (FLOATP (x) || FLOATP (y)) |
16787
3ad557e686b9
<float.h>: Include if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16756
diff
changeset
|
2742 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
|
2743 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2744 i1 = XINT (x); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2745 i2 = XINT (y); |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2746 |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2747 if (i2 == 0) |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
2748 xsignal0 (Qarith_error); |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
2749 |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2750 i1 %= i2; |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2751 |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2752 /* 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
|
2753 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
|
2754 i1 += i2; |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2755 |
9263
cda13734e32c
(make_number, Fsymbol_name, do_symval_forwarding, swap_in_symval_forwarding,
Karl Heuer <kwzh@gnu.org>
parents:
9194
diff
changeset
|
2756 XSETINT (val, i1); |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2757 return val; |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2758 } |
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
2759 |
298 | 2760 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
|
2761 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
|
2762 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
|
2763 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
|
2764 (int nargs, Lisp_Object *args) |
298 | 2765 { |
2766 return arith_driver (Amax, nargs, args); | |
2767 } | |
2768 | |
2769 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
|
2770 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
|
2771 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
|
2772 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
|
2773 (int nargs, Lisp_Object *args) |
298 | 2774 { |
2775 return arith_driver (Amin, nargs, args); | |
2776 } | |
2777 | |
2778 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
|
2779 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
|
2780 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
|
2781 usage: (logand &rest INTS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2782 (int nargs, Lisp_Object *args) |
298 | 2783 { |
2784 return arith_driver (Alogand, nargs, args); | |
2785 } | |
2786 | |
2787 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
|
2788 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
|
2789 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
|
2790 usage: (logior &rest INTS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2791 (int nargs, Lisp_Object *args) |
298 | 2792 { |
2793 return arith_driver (Alogior, nargs, args); | |
2794 } | |
2795 | |
2796 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
|
2797 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
|
2798 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
|
2799 usage: (logxor &rest INTS-OR-MARKERS) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2800 (int nargs, Lisp_Object *args) |
298 | 2801 { |
2802 return arith_driver (Alogxor, nargs, args); | |
2803 } | |
2804 | |
2805 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
|
2806 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
|
2807 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
|
2808 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
|
2809 (register Lisp_Object value, Lisp_Object count) |
298 | 2810 { |
2811 register Lisp_Object val; | |
2812 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2813 CHECK_NUMBER (value); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2814 CHECK_NUMBER (count); |
298 | 2815 |
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2816 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
|
2817 XSETINT (val, 0); |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2818 else if (XINT (count) > 0) |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2819 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
|
2820 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
|
2821 XSETINT (val, XINT (value) < 0 ? -1 : 0); |
298 | 2822 else |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2823 XSETINT (val, XINT (value) >> -XINT (count)); |
298 | 2824 return val; |
2825 } | |
2826 | |
2827 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
|
2828 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
|
2829 If COUNT is negative, shifting is actually to the right. |
47276
fbe02a367006
(Flsh): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
46831
diff
changeset
|
2830 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
|
2831 (register Lisp_Object value, Lisp_Object count) |
298 | 2832 { |
2833 register Lisp_Object val; | |
2834 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2835 CHECK_NUMBER (value); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2836 CHECK_NUMBER (count); |
298 | 2837 |
21819
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2838 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
|
2839 XSETINT (val, 0); |
c98ba82f4b52
(Flsh, Fash): Handle out-of-range shift counts reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
21775
diff
changeset
|
2840 else if (XINT (count) > 0) |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2841 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
|
2842 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
|
2843 XSETINT (val, 0); |
298 | 2844 else |
10951
6a8b6db450dc
(Fash, Flsh): Change arg names.
Richard M. Stallman <rms@gnu.org>
parents:
10725
diff
changeset
|
2845 XSETINT (val, (EMACS_UINT) XUINT (value) >> -XINT (count)); |
298 | 2846 return val; |
2847 } | |
2848 | |
2849 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
|
2850 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
|
2851 Markers are converted to integers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2852 (register Lisp_Object number) |
298 | 2853 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2854 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
|
2855 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2856 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
|
2857 return (make_float (1.0 + XFLOAT_DATA (number))); |
298 | 2858 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2859 XSETINT (number, XINT (number) + 1); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2860 return number; |
298 | 2861 } |
2862 | |
2863 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
|
2864 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
|
2865 Markers are converted to integers. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2866 (register Lisp_Object number) |
298 | 2867 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2868 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
|
2869 |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2870 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
|
2871 return (make_float (-1.0 + XFLOAT_DATA (number))); |
298 | 2872 |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2873 XSETINT (number, XINT (number) - 1); |
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2874 return number; |
298 | 2875 } |
2876 | |
2877 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
|
2878 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
|
2879 (register Lisp_Object number) |
298 | 2880 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40642
diff
changeset
|
2881 CHECK_NUMBER (number); |
14096
f3766d691555
(Flognot): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14066
diff
changeset
|
2882 XSETINT (number, ~XINT (number)); |
14066
2c6db67067ac
(Fboundp, Ffboundp, Fmakunbound, Ffmakunbound, Fsymbol_plist, Fsymbol_name,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
2883 return number; |
298 | 2884 } |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2885 |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2886 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
|
2887 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
|
2888 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
|
2889 lowercase l) for small endian machines. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2890 (void) |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2891 { |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2892 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
|
2893 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
|
2894 |
53966
26dc8943ee64
Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53910
diff
changeset
|
2895 return make_number (order); |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2896 } |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2897 |
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
2898 |
298 | 2899 |
2900 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2901 syms_of_data (void) |
298 | 2902 { |
2092
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
2903 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
|
2904 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2905 Qquote = intern_c_string ("quote"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2906 Qlambda = intern_c_string ("lambda"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2907 Qsubr = intern_c_string ("subr"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2908 Qerror_conditions = intern_c_string ("error-conditions"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2909 Qerror_message = intern_c_string ("error-message"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2910 Qtop_level = intern_c_string ("top-level"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2911 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2912 Qerror = intern_c_string ("error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2913 Qquit = intern_c_string ("quit"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2914 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
|
2915 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
|
2916 Qvoid_function = intern_c_string ("void-function"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2917 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
|
2918 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
|
2919 Qvoid_variable = intern_c_string ("void-variable"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2920 Qsetting_constant = intern_c_string ("setting-constant"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2921 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
|
2922 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2923 Qinvalid_function = intern_c_string ("invalid-function"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2924 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
|
2925 Qno_catch = intern_c_string ("no-catch"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2926 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
|
2927 Qarith_error = intern_c_string ("arith-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2928 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
|
2929 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
|
2930 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
|
2931 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
|
2932 Qmark_inactive = intern_c_string ("mark-inactive"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2933 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2934 Qlistp = intern_c_string ("listp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2935 Qconsp = intern_c_string ("consp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2936 Qsymbolp = intern_c_string ("symbolp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2937 Qkeywordp = intern_c_string ("keywordp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2938 Qintegerp = intern_c_string ("integerp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2939 Qnatnump = intern_c_string ("natnump"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2940 Qwholenump = intern_c_string ("wholenump"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2941 Qstringp = intern_c_string ("stringp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2942 Qarrayp = intern_c_string ("arrayp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2943 Qsequencep = intern_c_string ("sequencep"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2944 Qbufferp = intern_c_string ("bufferp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2945 Qvectorp = intern_c_string ("vectorp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2946 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
|
2947 Qmarkerp = intern_c_string ("markerp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2948 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
|
2949 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
|
2950 Qboundp = intern_c_string ("boundp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2951 Qfboundp = intern_c_string ("fboundp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2952 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2953 Qfloatp = intern_c_string ("floatp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2954 Qnumberp = intern_c_string ("numberp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2955 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
|
2956 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2957 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
|
2958 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
|
2959 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2960 Qsubrp = intern_c_string ("subrp"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2961 Qunevalled = intern_c_string ("unevalled"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2962 Qmany = intern_c_string ("many"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2963 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2964 Qcdr = intern_c_string ("cdr"); |
298 | 2965 |
8401
1eee41c8120c
(syms_of_data): Set up Qadvice_info, Qactivate_advice.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2966 /* Handle automatic advice activation */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2967 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
|
2968 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
|
2969 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2970 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
|
2971 |
298 | 2972 /* ERROR is used as a signaler for random errors for which nothing else is right */ |
2973 | |
2974 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
|
2975 error_tail); |
298 | 2976 Fput (Qerror, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2977 make_pure_c_string ("error")); |
298 | 2978 |
2979 Fput (Qquit, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2980 pure_cons (Qquit, Qnil)); |
298 | 2981 Fput (Qquit, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2982 make_pure_c_string ("Quit")); |
298 | 2983 |
2984 Fput (Qwrong_type_argument, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2985 pure_cons (Qwrong_type_argument, error_tail)); |
298 | 2986 Fput (Qwrong_type_argument, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2987 make_pure_c_string ("Wrong type argument")); |
298 | 2988 |
2989 Fput (Qargs_out_of_range, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2990 pure_cons (Qargs_out_of_range, error_tail)); |
298 | 2991 Fput (Qargs_out_of_range, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2992 make_pure_c_string ("Args out of range")); |
298 | 2993 |
2994 Fput (Qvoid_function, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2995 pure_cons (Qvoid_function, error_tail)); |
298 | 2996 Fput (Qvoid_function, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2997 make_pure_c_string ("Symbol's function definition is void")); |
298 | 2998 |
648 | 2999 Fput (Qcyclic_function_indirection, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3000 pure_cons (Qcyclic_function_indirection, error_tail)); |
648 | 3001 Fput (Qcyclic_function_indirection, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3002 make_pure_c_string ("Symbol's chain of function indirections contains a loop")); |
648 | 3003 |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3004 Fput (Qcyclic_variable_indirection, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3005 pure_cons (Qcyclic_variable_indirection, error_tail)); |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3006 Fput (Qcyclic_variable_indirection, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3007 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
|
3008 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3009 Qcircular_list = intern_c_string ("circular-list"); |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3010 staticpro (&Qcircular_list); |
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3011 Fput (Qcircular_list, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3012 pure_cons (Qcircular_list, error_tail)); |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3013 Fput (Qcircular_list, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3014 make_pure_c_string ("List contains a loop")); |
39767
00f499d0cd16
(Qcircular_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39632
diff
changeset
|
3015 |
298 | 3016 Fput (Qvoid_variable, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3017 pure_cons (Qvoid_variable, error_tail)); |
298 | 3018 Fput (Qvoid_variable, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3019 make_pure_c_string ("Symbol's value as variable is void")); |
298 | 3020 |
3021 Fput (Qsetting_constant, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3022 pure_cons (Qsetting_constant, error_tail)); |
298 | 3023 Fput (Qsetting_constant, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3024 make_pure_c_string ("Attempt to set a constant symbol")); |
298 | 3025 |
3026 Fput (Qinvalid_read_syntax, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3027 pure_cons (Qinvalid_read_syntax, error_tail)); |
298 | 3028 Fput (Qinvalid_read_syntax, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3029 make_pure_c_string ("Invalid read syntax")); |
298 | 3030 |
3031 Fput (Qinvalid_function, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3032 pure_cons (Qinvalid_function, error_tail)); |
298 | 3033 Fput (Qinvalid_function, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3034 make_pure_c_string ("Invalid function")); |
298 | 3035 |
3036 Fput (Qwrong_number_of_arguments, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3037 pure_cons (Qwrong_number_of_arguments, error_tail)); |
298 | 3038 Fput (Qwrong_number_of_arguments, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3039 make_pure_c_string ("Wrong number of arguments")); |
298 | 3040 |
3041 Fput (Qno_catch, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3042 pure_cons (Qno_catch, error_tail)); |
298 | 3043 Fput (Qno_catch, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3044 make_pure_c_string ("No catch for tag")); |
298 | 3045 |
3046 Fput (Qend_of_file, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3047 pure_cons (Qend_of_file, error_tail)); |
298 | 3048 Fput (Qend_of_file, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3049 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
|
3050 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3051 arith_tail = pure_cons (Qarith_error, error_tail); |
298 | 3052 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
|
3053 arith_tail); |
298 | 3054 Fput (Qarith_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3055 make_pure_c_string ("Arithmetic error")); |
298 | 3056 |
3057 Fput (Qbeginning_of_buffer, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3058 pure_cons (Qbeginning_of_buffer, error_tail)); |
298 | 3059 Fput (Qbeginning_of_buffer, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3060 make_pure_c_string ("Beginning of buffer")); |
298 | 3061 |
3062 Fput (Qend_of_buffer, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3063 pure_cons (Qend_of_buffer, error_tail)); |
298 | 3064 Fput (Qend_of_buffer, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3065 make_pure_c_string ("End of buffer")); |
298 | 3066 |
3067 Fput (Qbuffer_read_only, Qerror_conditions, | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3068 pure_cons (Qbuffer_read_only, error_tail)); |
298 | 3069 Fput (Qbuffer_read_only, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3070 make_pure_c_string ("Buffer is read-only")); |
298 | 3071 |
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3072 Fput (Qtext_read_only, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3073 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
|
3074 Fput (Qtext_read_only, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3075 make_pure_c_string ("Text is read-only")); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3076 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3077 Qrange_error = intern_c_string ("range-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3078 Qdomain_error = intern_c_string ("domain-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3079 Qsingularity_error = intern_c_string ("singularity-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3080 Qoverflow_error = intern_c_string ("overflow-error"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3081 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
|
3082 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3083 Fput (Qdomain_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3084 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
|
3085 Fput (Qdomain_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 domain 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 (Qrange_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3089 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
|
3090 Fput (Qrange_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 range 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 Fput (Qsingularity_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3094 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
|
3095 Fput (Qsingularity_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3096 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
|
3097 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3098 Fput (Qoverflow_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3099 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
|
3100 Fput (Qoverflow_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3101 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
|
3102 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3103 Fput (Qunderflow_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3104 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
|
3105 Fput (Qunderflow_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3106 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
|
3107 |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3108 staticpro (&Qrange_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3109 staticpro (&Qdomain_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3110 staticpro (&Qsingularity_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3111 staticpro (&Qoverflow_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3112 staticpro (&Qunderflow_error); |
7497fce1e426
(syms_of_data) [LISP_FLOAT_TYPE]: Define new error conditions:
Richard M. Stallman <rms@gnu.org>
parents:
1987
diff
changeset
|
3113 |
298 | 3114 staticpro (&Qnil); |
3115 staticpro (&Qt); | |
3116 staticpro (&Qquote); | |
3117 staticpro (&Qlambda); | |
3118 staticpro (&Qsubr); | |
3119 staticpro (&Qunbound); | |
3120 staticpro (&Qerror_conditions); | |
3121 staticpro (&Qerror_message); | |
3122 staticpro (&Qtop_level); | |
3123 | |
3124 staticpro (&Qerror); | |
3125 staticpro (&Qquit); | |
3126 staticpro (&Qwrong_type_argument); | |
3127 staticpro (&Qargs_out_of_range); | |
3128 staticpro (&Qvoid_function); | |
648 | 3129 staticpro (&Qcyclic_function_indirection); |
61888
a0e6e458f2fc
(syms_of_data) Staticpro Qcyclic_variable_indirection.
Kim F. Storm <storm@cua.dk>
parents:
61686
diff
changeset
|
3130 staticpro (&Qcyclic_variable_indirection); |
298 | 3131 staticpro (&Qvoid_variable); |
3132 staticpro (&Qsetting_constant); | |
3133 staticpro (&Qinvalid_read_syntax); | |
3134 staticpro (&Qwrong_number_of_arguments); | |
3135 staticpro (&Qinvalid_function); | |
3136 staticpro (&Qno_catch); | |
3137 staticpro (&Qend_of_file); | |
3138 staticpro (&Qarith_error); | |
3139 staticpro (&Qbeginning_of_buffer); | |
3140 staticpro (&Qend_of_buffer); | |
3141 staticpro (&Qbuffer_read_only); | |
26274
e310c2b8e6ed
(Qtext_read_only): New built-in error.
Gerd Moellmann <gerd@gnu.org>
parents:
26205
diff
changeset
|
3142 staticpro (&Qtext_read_only); |
4037
aecb99c65ab0
(syms_of_data): Staticpro Qmark_inactive.
Roland McGrath <roland@gnu.org>
parents:
4036
diff
changeset
|
3143 staticpro (&Qmark_inactive); |
298 | 3144 |
3145 staticpro (&Qlistp); | |
3146 staticpro (&Qconsp); | |
3147 staticpro (&Qsymbolp); | |
26931 | 3148 staticpro (&Qkeywordp); |
298 | 3149 staticpro (&Qintegerp); |
3150 staticpro (&Qnatnump); | |
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3151 staticpro (&Qwholenump); |
298 | 3152 staticpro (&Qstringp); |
3153 staticpro (&Qarrayp); | |
3154 staticpro (&Qsequencep); | |
3155 staticpro (&Qbufferp); | |
3156 staticpro (&Qvectorp); | |
3157 staticpro (&Qchar_or_string_p); | |
3158 staticpro (&Qmarkerp); | |
1293 | 3159 staticpro (&Qbuffer_or_string_p); |
298 | 3160 staticpro (&Qinteger_or_marker_p); |
3161 staticpro (&Qfloatp); | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3162 staticpro (&Qnumberp); |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3163 staticpro (&Qnumber_or_marker_p); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3164 staticpro (&Qchar_table_p); |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3165 staticpro (&Qvector_or_char_table_p); |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3166 staticpro (&Qsubrp); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3167 staticpro (&Qmany); |
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3168 staticpro (&Qunevalled); |
298 | 3169 |
3170 staticpro (&Qboundp); | |
3171 staticpro (&Qfboundp); | |
3172 staticpro (&Qcdr); | |
8448
b6335ce87e16
(Fdefine_function, Fdefalias): Handle advice as in Ffset.
Richard M. Stallman <rms@gnu.org>
parents:
8415
diff
changeset
|
3173 staticpro (&Qad_advice_info); |
26205
65a0abaeed68
(Qad_activate_internal): Renamed from Qad_activate.
Gerd Moellmann <gerd@gnu.org>
parents:
26185
diff
changeset
|
3174 staticpro (&Qad_activate_internal); |
298 | 3175 |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3176 /* Types that type-of returns. */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3177 Qinteger = intern_c_string ("integer"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3178 Qsymbol = intern_c_string ("symbol"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3179 Qstring = intern_c_string ("string"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3180 Qcons = intern_c_string ("cons"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3181 Qmarker = intern_c_string ("marker"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3182 Qoverlay = intern_c_string ("overlay"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3183 Qfloat = intern_c_string ("float"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3184 Qwindow_configuration = intern_c_string ("window-configuration"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3185 Qprocess = intern_c_string ("process"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3186 Qwindow = intern_c_string ("window"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3187 /* Qsubr = intern_c_string ("subr"); */ |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3188 Qcompiled_function = intern_c_string ("compiled-function"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3189 Qbuffer = intern_c_string ("buffer"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3190 Qframe = intern_c_string ("frame"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3191 Qvector = intern_c_string ("vector"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3192 Qchar_table = intern_c_string ("char-table"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3193 Qbool_vector = intern_c_string ("bool-vector"); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3194 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
|
3195 |
102158
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3196 DEFSYM (Qfont_spec, "font-spec"); |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3197 DEFSYM (Qfont_entity, "font-entity"); |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3198 DEFSYM (Qfont_object, "font-object"); |
f28542a2c7f7
(syms_of_data): Define Qfont_spec, Qfont_entity, and
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
3199 |
102718
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
3200 DEFSYM (Qinteractive_form, "interactive-form"); |
ec53ed9e6925
(Qinteractive_form): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
102158
diff
changeset
|
3201 |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3202 staticpro (&Qinteger); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3203 staticpro (&Qsymbol); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3204 staticpro (&Qstring); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3205 staticpro (&Qcons); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3206 staticpro (&Qmarker); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3207 staticpro (&Qoverlay); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3208 staticpro (&Qfloat); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3209 staticpro (&Qwindow_configuration); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3210 staticpro (&Qprocess); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3211 staticpro (&Qwindow); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3212 /* staticpro (&Qsubr); */ |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3213 staticpro (&Qcompiled_function); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3214 staticpro (&Qbuffer); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3215 staticpro (&Qframe); |
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3216 staticpro (&Qvector); |
13715
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3217 staticpro (&Qchar_table); |
89ffc133f813
(Ftype_of): Return `char-table' and `bool-vector' for
Karl Heuer <kwzh@gnu.org>
parents:
13593
diff
changeset
|
3218 staticpro (&Qbool_vector); |
26185 | 3219 staticpro (&Qhash_table); |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3220 |
37853
93e5959b8a0e
Use SYMBOL_VALUE/SET_SYMBOL_VALUE.
Gerd Moellmann <gerd@gnu.org>
parents:
37053
diff
changeset
|
3221 defsubr (&Sindirect_variable); |
54627
532e0d3d8fc1
(Finteractive_form): Rename from Fsubr_interactive_form.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53966
diff
changeset
|
3222 defsubr (&Sinteractive_form); |
298 | 3223 defsubr (&Seq); |
3224 defsubr (&Snull); | |
10725
24958130d147
Rename arg OBJ to OBJECT in all type predicates.
Richard M. Stallman <rms@gnu.org>
parents:
10645
diff
changeset
|
3225 defsubr (&Stype_of); |
298 | 3226 defsubr (&Slistp); |
3227 defsubr (&Snlistp); | |
3228 defsubr (&Sconsp); | |
3229 defsubr (&Satom); | |
3230 defsubr (&Sintegerp); | |
695
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3231 defsubr (&Sinteger_or_marker_p); |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3232 defsubr (&Snumberp); |
e3fac20d3015
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
3233 defsubr (&Snumber_or_marker_p); |
298 | 3234 defsubr (&Sfloatp); |
3235 defsubr (&Snatnump); | |
3236 defsubr (&Ssymbolp); | |
26931 | 3237 defsubr (&Skeywordp); |
298 | 3238 defsubr (&Sstringp); |
20793
b2af60896559
(syms_of_data): Register multibyte-string-p as a Lisp
Kenichi Handa <handa@m17n.org>
parents:
20716
diff
changeset
|
3239 defsubr (&Smultibyte_string_p); |
298 | 3240 defsubr (&Svectorp); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3241 defsubr (&Schar_table_p); |
13200
5fd4e8e4185a
(Qvector_or_char_table_p): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13148
diff
changeset
|
3242 defsubr (&Svector_or_char_table_p); |
13148
18b1b690defe
(Fchartablep, Fboolvectorp): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
12528
diff
changeset
|
3243 defsubr (&Sbool_vector_p); |
298 | 3244 defsubr (&Sarrayp); |
3245 defsubr (&Ssequencep); | |
3246 defsubr (&Sbufferp); | |
3247 defsubr (&Smarkerp); | |
3248 defsubr (&Ssubrp); | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1648
diff
changeset
|
3249 defsubr (&Sbyte_code_function_p); |
298 | 3250 defsubr (&Schar_or_string_p); |
3251 defsubr (&Scar); | |
3252 defsubr (&Scdr); | |
3253 defsubr (&Scar_safe); | |
3254 defsubr (&Scdr_safe); | |
3255 defsubr (&Ssetcar); | |
3256 defsubr (&Ssetcdr); | |
3257 defsubr (&Ssymbol_function); | |
648 | 3258 defsubr (&Sindirect_function); |
298 | 3259 defsubr (&Ssymbol_plist); |
3260 defsubr (&Ssymbol_name); | |
3261 defsubr (&Smakunbound); | |
3262 defsubr (&Sfmakunbound); | |
3263 defsubr (&Sboundp); | |
3264 defsubr (&Sfboundp); | |
3265 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
|
3266 defsubr (&Sdefalias); |
298 | 3267 defsubr (&Ssetplist); |
3268 defsubr (&Ssymbol_value); | |
3269 defsubr (&Sset); | |
3270 defsubr (&Sdefault_boundp); | |
3271 defsubr (&Sdefault_value); | |
3272 defsubr (&Sset_default); | |
3273 defsubr (&Ssetq_default); | |
3274 defsubr (&Smake_variable_buffer_local); | |
3275 defsubr (&Smake_local_variable); | |
3276 defsubr (&Skill_local_variable); | |
21144
6988880cc529
(store_symval_forwarding, swap_in_symval_forwarding)
Richard M. Stallman <rms@gnu.org>
parents:
20996
diff
changeset
|
3277 defsubr (&Smake_variable_frame_local); |
9194
3db4151c3d00
(Fmake_local_variable): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9147
diff
changeset
|
3278 defsubr (&Slocal_variable_p); |
12295
b4731504d3ab
(Flocal_variable_if_set_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
3279 defsubr (&Slocal_variable_if_set_p); |
52537
ab6a470dc45f
(Fvariable_binding_locus): New function.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
3280 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
|
3281 #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
|
3282 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
|
3283 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
|
3284 #endif |
298 | 3285 defsubr (&Saref); |
3286 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
|
3287 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
|
3288 defsubr (&Sstring_to_number); |
298 | 3289 defsubr (&Seqlsign); |
3290 defsubr (&Slss); | |
3291 defsubr (&Sgtr); | |
3292 defsubr (&Sleq); | |
3293 defsubr (&Sgeq); | |
3294 defsubr (&Sneq); | |
3295 defsubr (&Szerop); | |
3296 defsubr (&Splus); | |
3297 defsubr (&Sminus); | |
3298 defsubr (&Stimes); | |
3299 defsubr (&Squo); | |
3300 defsubr (&Srem); | |
4508
763987892042
(Fmod): New function; result is always same sign as divisor.
Paul Eggert <eggert@twinsun.com>
parents:
4447
diff
changeset
|
3301 defsubr (&Smod); |
298 | 3302 defsubr (&Smax); |
3303 defsubr (&Smin); | |
3304 defsubr (&Slogand); | |
3305 defsubr (&Slogior); | |
3306 defsubr (&Slogxor); | |
3307 defsubr (&Slsh); | |
3308 defsubr (&Sash); | |
3309 defsubr (&Sadd1); | |
3310 defsubr (&Ssub1); | |
3311 defsubr (&Slognot); | |
53910
9c480a55fc22
* data.c (Fbyteorder): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53365
diff
changeset
|
3312 defsubr (&Sbyteorder); |
29237
ae0e64edbaad
(Qsubrp, Qmany, Qunevalled): New variables.
Dave Love <fx@gnu.org>
parents:
29007
diff
changeset
|
3313 defsubr (&Ssubr_arity); |
55230
c41874c7d876
(Fsubr_name): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55160
diff
changeset
|
3314 defsubr (&Ssubr_name); |
6459
30fabcc03f0c
(Qwholenump): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6448
diff
changeset
|
3315 |
9954
18b408b05189
(syms_of_data): Set Qwholenump as function, not variable.
Karl Heuer <kwzh@gnu.org>
parents:
9895
diff
changeset
|
3316 XSYMBOL (Qwholenump)->function = XSYMBOL (Qnatnump)->function; |
39632
8cd74f2aa6e2
(most_positive_fixnum, most_negative_fixnum): New
Gerd Moellmann <gerd@gnu.org>
parents:
37853
diff
changeset
|
3317 |
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3318 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
|
3319 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
|
3320 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
|
3321 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
|
3322 |
41865
f5dbdfc9fe27
(Vmost_positive_fixnum, Vmost_negative_fixnum): Renamed
Andreas Schwab <schwab@suse.de>
parents:
41153
diff
changeset
|
3323 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
|
3324 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
|
3325 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
|
3326 XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1; |
298 | 3327 } |
3328 | |
490 | 3329 SIGTYPE |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3330 arith_error (int signo) |
298 | 3331 { |
638 | 3332 sigsetmask (SIGEMPTYMASK); |
298 | 3333 |
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58733
diff
changeset
|
3334 SIGNAL_THREAD_CHECK (signo); |
71973
7febc7ff0f0d
(circular_list_error): Use xsignal.
Kim F. Storm <storm@cua.dk>
parents:
71871
diff
changeset
|
3335 xsignal0 (Qarith_error); |
298 | 3336 } |
3337 | |
21514 | 3338 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3339 init_data (void) |
298 | 3340 { |
3341 /* Don't do this if just dumping out. | |
3342 We don't want to call `signal' in this case | |
3343 so that we don't have trouble with dumping | |
3344 signal-delivering routines in an inconsistent state. */ | |
3345 #ifndef CANNOT_DUMP | |
3346 if (!initialized) | |
3347 return; | |
3348 #endif /* CANNOT_DUMP */ | |
3349 signal (SIGFPE, arith_error); | |
10605
bc37b55fcbb9
(do_symval_forwarding): Handle display-local vars.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
3350 |
298 | 3351 #ifdef uts |
3352 signal (SIGEMT, arith_error); | |
3353 #endif /* uts */ | |
3354 } | |
52401 | 3355 |
3356 /* arch-tag: 25879798-b84d-479a-9c89-7d148e2109f7 | |
3357 (do not change this comment) */ |